1 --- configure 2012-05-10 11:52:02.000000000 -0700 |
1 --- configure 2012-05-10 11:52:02.000000000 -0700 |
2 +++ configure 2012-05-21 11:21:44.053205016 -0700 |
2 +++ configure 2013-03-20 14:20:04.139519952 -0700 |
3 @@ -4686,14 +4686,14 @@ |
3 @@ -4686,14 +4686,14 @@ |
4 fi |
4 fi |
5 |
5 |
6 if test "$enable_all_static" = "yes"; then |
6 if test "$enable_all_static" = "yes"; then |
7 - SVN_APR_LIBS="`$apr_config --link-ld --libs`" |
7 - SVN_APR_LIBS="`$apr_config --link-ld --libs`" |
36 - as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5 |
36 - as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5 |
37 + as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5 |
37 + as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5 |
38 fi |
38 fi |
39 fi |
39 fi |
40 SVN_APRUTIL_LIBS="` |
40 SVN_APRUTIL_LIBS="` |
|
41 @@ -5300,6 +5300,8 @@ |
|
42 old_CFLAGS="$CFLAGS" |
|
43 old_LIBS="$LIBS" |
|
44 NEON_LIBS=`$PKG_CONFIG neon --libs` |
|
45 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
46 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
47 CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" |
|
48 LIBS="$LIBS $NEON_LIBS" |
|
49 neon_test_code=" |
|
50 @@ -5320,6 +5322,8 @@ |
|
51 conftest$ac_exeext conftest.$ac_ext |
|
52 if test "$shared_linking" = "no"; then |
|
53 NEON_LIBS=`$PKG_CONFIG neon --libs --static` |
|
54 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
55 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
56 LIBS="$LIBS $NEON_LIBS" |
|
57 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
58 /* end confdefs.h. */ |
|
59 @@ -5481,6 +5485,8 @@ |
|
60 old_CFLAGS="$CFLAGS" |
|
61 old_LIBS="$LIBS" |
|
62 NEON_LIBS=`$PKG_CONFIG neon --libs` |
|
63 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
64 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
65 CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" |
|
66 LIBS="$LIBS $NEON_LIBS" |
|
67 neon_test_code=" |
|
68 @@ -5501,6 +5507,8 @@ |
|
69 conftest$ac_exeext conftest.$ac_ext |
|
70 if test "$shared_linking" = "no"; then |
|
71 NEON_LIBS=`$PKG_CONFIG neon --libs --static` |
|
72 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
73 + NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
74 LIBS="$LIBS $NEON_LIBS" |
|
75 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
76 /* end confdefs.h. */ |
|
77 @@ -5520,6 +5528,8 @@ |
|
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 |
|
88 |
|
89 |
|
90 - |
|
91 - |
|
92 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'` |
|
93 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'` |
|
94 +export NEON_LIBS |
|
95 |
|
96 |
|
97 if test "$svn_lib_neon" = "yes"; then |
|
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" |
|
102 old_LIBS="$LIBS" |
|
103 CFLAGS="" |
|
104 - SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`" |
|
105 - SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`" |
|
106 + SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberos5" |
|
107 + SVN_GSSAPI_LIBS="-lgss" |
|
108 SVN_GSSAPI_LIBS="` |
|
109 input_flags="$SVN_GSSAPI_LIBS" |
|
110 output_flags="" |