1 --- configure 2012-05-10 11:52:02.000000000 -0700 |
1 # Internal patch. |
2 +++ configure 2013-03-20 14:20:04.139519952 -0700 |
2 # apr-config and apu-config use the wrong options |
|
3 # neon library pkg-config should not print the library path |
|
4 # Our Kerberos installation is not 100% compatible with MIT-Kerberos |
|
5 --- configure 2014-12-08 23:32:25.000000000 -0800 |
|
6 +++ configure 2015-01-20 10:36:42.439487008 -0800 |
3 @@ -4686,14 +4686,14 @@ |
7 @@ -4686,14 +4686,14 @@ |
4 fi |
8 fi |
5 |
9 |
6 if test "$enable_all_static" = "yes"; then |
10 if test "$enable_all_static" = "yes"; then |
7 - SVN_APR_LIBS="`$apr_config --link-ld --libs`" |
11 - SVN_APR_LIBS="`$apr_config --link-ld --libs`" |
10 - as_fn_error $? "apr-config --link-ld --libs failed" "$LINENO" 5 |
14 - as_fn_error $? "apr-config --link-ld --libs failed" "$LINENO" 5 |
11 + as_fn_error $? "apr-config --link-libtool --libs failed" "$LINENO" 5 |
15 + as_fn_error $? "apr-config --link-libtool --libs failed" "$LINENO" 5 |
12 fi |
16 fi |
13 else |
17 else |
14 - SVN_APR_LIBS="`$apr_config --link-ld`" |
18 - SVN_APR_LIBS="`$apr_config --link-ld`" |
15 + SVN_APR_LIBS="`$apr_config --link-libtool --libs`" |
19 + SVN_APR_LIBS="`$apr_config --link-libtool`" |
16 if test $? -ne 0; then |
20 if test $? -ne 0; then |
17 - as_fn_error $? "apr-config --link-ld failed" "$LINENO" 5 |
21 - as_fn_error $? "apr-config --link-ld failed" "$LINENO" 5 |
18 + as_fn_error $? "apr-config --link-libtool failed" "$LINENO" 5 |
22 + as_fn_error $? "apr-config --link-libtool failed" "$LINENO" 5 |
19 fi |
23 fi |
20 fi |
24 fi |
29 - as_fn_error $? "apu-config --link-ld --libs failed" "$LINENO" 5 |
33 - as_fn_error $? "apu-config --link-ld --libs failed" "$LINENO" 5 |
30 + as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5 |
34 + as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5 |
31 fi |
35 fi |
32 else |
36 else |
33 - SVN_APRUTIL_LIBS="`$apu_config --link-ld`" |
37 - SVN_APRUTIL_LIBS="`$apu_config --link-ld`" |
34 + SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" |
38 + SVN_APRUTIL_LIBS="`$apu_config --link-libtool`" |
35 if test $? -ne 0; then |
39 if test $? -ne 0; then |
36 - as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5 |
40 - as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5 |
37 + as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5 |
41 + as_fn_error $? "apu-config --link-libtool failed" "$LINENO" 5 |
38 fi |
42 fi |
39 fi |
43 fi |
40 SVN_APRUTIL_LIBS="` |
44 SVN_APRUTIL_LIBS="` |
41 @@ -5300,6 +5300,8 @@ |
45 @@ -5300,6 +5300,8 @@ |
42 old_CFLAGS="$CFLAGS" |
46 old_CFLAGS="$CFLAGS" |
49 neon_test_code=" |
53 neon_test_code=" |
50 @@ -5320,6 +5322,8 @@ |
54 @@ -5320,6 +5322,8 @@ |
51 conftest$ac_exeext conftest.$ac_ext |
55 conftest$ac_exeext conftest.$ac_ext |
52 if test "$shared_linking" = "no"; then |
56 if test "$shared_linking" = "no"; then |
53 NEON_LIBS=`$PKG_CONFIG neon --libs --static` |
57 NEON_LIBS=`$PKG_CONFIG neon --libs --static` |
54 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
58 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
55 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
59 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
56 LIBS="$LIBS $NEON_LIBS" |
60 LIBS="$LIBS $NEON_LIBS" |
57 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
61 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
58 /* end confdefs.h. */ |
62 /* end confdefs.h. */ |
59 @@ -5481,6 +5485,8 @@ |
63 @@ -5481,6 +5485,8 @@ |
60 old_CFLAGS="$CFLAGS" |
64 old_CFLAGS="$CFLAGS" |
61 old_LIBS="$LIBS" |
65 old_LIBS="$LIBS" |
62 NEON_LIBS=`$PKG_CONFIG neon --libs` |
66 NEON_LIBS=`$PKG_CONFIG neon --libs` |
63 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
67 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
64 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
68 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
65 CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" |
69 CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" |
66 LIBS="$LIBS $NEON_LIBS" |
70 LIBS="$LIBS $NEON_LIBS" |
67 neon_test_code=" |
71 neon_test_code=" |
68 @@ -5501,6 +5507,8 @@ |
72 @@ -5501,6 +5507,8 @@ |
69 conftest$ac_exeext conftest.$ac_ext |
73 conftest$ac_exeext conftest.$ac_ext |
70 if test "$shared_linking" = "no"; then |
74 if test "$shared_linking" = "no"; then |
71 NEON_LIBS=`$PKG_CONFIG neon --libs --static` |
75 NEON_LIBS=`$PKG_CONFIG neon --libs --static` |
72 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
76 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
73 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
77 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
74 LIBS="$LIBS $NEON_LIBS" |
78 LIBS="$LIBS $NEON_LIBS" |
75 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
79 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
76 /* end confdefs.h. */ |
80 /* end confdefs.h. */ |
77 @@ -5520,6 +5528,8 @@ |
81 @@ -5576,9 +5584,9 @@ |
78 SVN_NEON_INCLUDES=`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'` |
|
79 CFLAGS="$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`" |
|
80 NEON_LIBS=`$neon_config --libs` |
|
81 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
82 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
83 fi |
|
84 svn_lib_neon="yes" |
|
85 break |
|
86 @@ -5576,8 +5586,9 @@ |
|
87 fi |
82 fi |
88 |
83 |
89 |
84 |
|
85 - |
90 - |
86 - |
91 - |
87 - |
92 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
88 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
93 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
89 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
94 +export NEON_LIBS |
90 +export NEON_LIBS |
95 |
91 |
|
92 if test "$svn_lib_neon" = "yes"; then |
96 |
93 |
97 if test "$svn_lib_neon" = "yes"; then |
94 @@ -6106,11 +6114,11 @@ |
98 --- configure 2013-07-29 12:50:28.716771506 -0700 |
|
99 +++ configure 2013-07-29 13:04:59.668934315 -0700 |
|
100 @@ -6098,8 +6098,8 @@ |
|
101 old_CFLAGS="$CFLAGS" |
95 old_CFLAGS="$CFLAGS" |
102 old_LIBS="$LIBS" |
96 old_LIBS="$LIBS" |
103 CFLAGS="" |
97 CFLAGS="" |
104 - SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`" |
98 - SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`" |
105 - SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`" |
99 - SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`" |
106 + SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberos5" |
100 + SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5" |
107 + SVN_GSSAPI_LIBS="-lgss" |
101 + SVN_GSSAPI_LIBS="-lgss" |
108 SVN_GSSAPI_LIBS="` |
102 if test $? -ne 0; then |
109 input_flags="$SVN_GSSAPI_LIBS" |
103 - SVN_GSSAPI_INCLUDES="$SVN_GSSAPI_INCLUDES -I/usr/include/gssapi" |
110 output_flags="" |
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 |