1 # Pass the right flags to apr-config and apu-config. |
1 # Internal patch. |
2 # Only Solaris seems to need this, so not for upstream. |
2 # apr-config and apu-config use the wrong options |
3 --- configure 2015-12-07 23:53:20.000000000 -0800 |
3 # neon library pkg-config should not print the library path |
4 +++ configure 2016-03-20 15:21:11.528922510 -0700 |
4 # Our Kerberos installation is not 100% compatible with MIT-Kerberos |
5 @@ -4896,14 +4896,14 @@ |
5 --- configure 2014-12-08 23:32:25.000000000 -0800 |
|
6 +++ configure 2015-01-20 10:36:42.439487008 -0800 |
|
7 @@ -4686,14 +4686,14 @@ |
6 fi |
8 fi |
7 |
9 |
8 if test "$enable_all_static" = "yes"; then |
10 if test "$enable_all_static" = "yes"; then |
9 - SVN_APR_LIBS="`$apr_config --link-ld --libs`" |
11 - SVN_APR_LIBS="`$apr_config --link-ld --libs`" |
10 + SVN_APR_LIBS="`$apr_config --link-libtool --libs`" |
12 + SVN_APR_LIBS="`$apr_config --link-libtool --libs`" |
19 - as_fn_error $? "apr-config --link-ld failed" "$LINENO" 5 |
21 - as_fn_error $? "apr-config --link-ld failed" "$LINENO" 5 |
20 + as_fn_error $? "apr-config --link-libtool failed" "$LINENO" 5 |
22 + as_fn_error $? "apr-config --link-libtool failed" "$LINENO" 5 |
21 fi |
23 fi |
22 fi |
24 fi |
23 SVN_APR_LIBS="` |
25 SVN_APR_LIBS="` |
24 @@ -5140,14 +5140,14 @@ |
26 @@ -5089,14 +5089,14 @@ |
25 fi |
27 fi |
26 |
28 |
27 if test "$enable_all_static" = "yes"; then |
29 if test "$enable_all_static" = "yes"; then |
28 - SVN_APRUTIL_LIBS="`$apu_config --link-ld --libs`" |
30 - SVN_APRUTIL_LIBS="`$apu_config --link-ld --libs`" |
29 + SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" |
31 + SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" |
38 - as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5 |
40 - as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5 |
39 + as_fn_error $? "apu-config --link-libtool failed" "$LINENO" 5 |
41 + as_fn_error $? "apu-config --link-libtool failed" "$LINENO" 5 |
40 fi |
42 fi |
41 fi |
43 fi |
42 SVN_APRUTIL_LIBS="` |
44 SVN_APRUTIL_LIBS="` |
|
45 @@ -5300,6 +5300,8 @@ |
|
46 old_CFLAGS="$CFLAGS" |
|
47 old_LIBS="$LIBS" |
|
48 NEON_LIBS=`$PKG_CONFIG neon --libs` |
|
49 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
50 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
51 CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" |
|
52 LIBS="$LIBS $NEON_LIBS" |
|
53 neon_test_code=" |
|
54 @@ -5320,6 +5322,8 @@ |
|
55 conftest$ac_exeext conftest.$ac_ext |
|
56 if test "$shared_linking" = "no"; then |
|
57 NEON_LIBS=`$PKG_CONFIG neon --libs --static` |
|
58 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
59 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
60 LIBS="$LIBS $NEON_LIBS" |
|
61 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
62 /* end confdefs.h. */ |
|
63 @@ -5481,6 +5485,8 @@ |
|
64 old_CFLAGS="$CFLAGS" |
|
65 old_LIBS="$LIBS" |
|
66 NEON_LIBS=`$PKG_CONFIG neon --libs` |
|
67 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
68 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
69 CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" |
|
70 LIBS="$LIBS $NEON_LIBS" |
|
71 neon_test_code=" |
|
72 @@ -5501,6 +5507,8 @@ |
|
73 conftest$ac_exeext conftest.$ac_ext |
|
74 if test "$shared_linking" = "no"; then |
|
75 NEON_LIBS=`$PKG_CONFIG neon --libs --static` |
|
76 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
77 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
78 LIBS="$LIBS $NEON_LIBS" |
|
79 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
80 /* end confdefs.h. */ |
|
81 @@ -5576,9 +5584,9 @@ |
|
82 fi |
|
83 |
|
84 |
|
85 - |
|
86 - |
|
87 - |
|
88 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
89 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
90 +export NEON_LIBS |
|
91 |
|
92 if test "$svn_lib_neon" = "yes"; then |
|
93 |
|
94 @@ -6106,11 +6114,11 @@ |
|
95 old_CFLAGS="$CFLAGS" |
|
96 old_LIBS="$LIBS" |
|
97 CFLAGS="" |
|
98 - SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`" |
|
99 - SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`" |
|
100 + SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5" |
|
101 + SVN_GSSAPI_LIBS="-lgss" |
|
102 if test $? -ne 0; then |
|
103 - SVN_GSSAPI_INCLUDES="$SVN_GSSAPI_INCLUDES -I/usr/include/gssapi" |
|
104 - SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs krb5` -lgss" |
|
105 + SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5" |
|
106 + SVN_GSSAPI_LIBS="-lgss" |
|
107 if test $? -ne 0; then |
|
108 as_fn_error $? "krb5-config returned an error" "$LINENO" 5 |
|
109 fi |