|
Line
Link Here
|
| 0 |
-- configure.ac |
0 |
++ configure.ac |
|
Lines 234-239
Link Here
|
| 234 |
AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH, |
234 |
AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH, |
| 235 |
[The desired patch version for the Berkeley DB]) |
235 |
[The desired patch version for the Berkeley DB]) |
| 236 |
|
236 |
|
|
|
237 |
AC_SUBST(SVN_DB_LIBS) |
| 238 |
|
| 237 |
SVN_LIB_SASL |
239 |
SVN_LIB_SASL |
| 238 |
|
240 |
|
| 239 |
if test "$svn_lib_sasl" = "yes"; then |
241 |
if test "$svn_lib_sasl" = "yes"; then |
| 240 |
-- Makefile.in |
242 |
++ Makefile.in |
|
Lines 40-48
Link Here
|
| 40 |
NEON_LIBS = @NEON_LIBS@ |
40 |
NEON_LIBS = @NEON_LIBS@ |
| 41 |
SVN_APR_LIBS = @SVN_APR_LIBS@ |
41 |
SVN_APR_LIBS = @SVN_APR_LIBS@ |
| 42 |
SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@ |
42 |
SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@ |
| 43 |
SVN_DB_LIBS = |
43 |
SVN_DB_LIBS = @SVN_DB_LIBS@ |
| 44 |
SVN_SERF_LIBS = @SVN_SERF_LIBS@ |
|
|
| 45 |
SVN_SASL_LIBS = @SVN_SASL_LIBS@ |
44 |
SVN_SASL_LIBS = @SVN_SASL_LIBS@ |
|
|
45 |
SVN_SERF_LIBS = @SVN_SERF_LIBS@ |
| 46 |
SVN_XML_LIBS = -lexpat |
| 46 |
SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ |
47 |
SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ |
| 47 |
|
48 |
|
| 48 |
LIBS = @LIBS@ |
49 |
LIBS = @LIBS@ |
| 49 |
-- build/ac-macros/aprutil.m4 |
50 |
++ build/ac-macros/aprutil.m4 |
|
Lines 72-87
Link Here
|
| 72 |
AC_MSG_ERROR([apu-config --includes failed]) |
72 |
AC_MSG_ERROR([apu-config --includes failed]) |
| 73 |
fi |
73 |
fi |
| 74 |
|
74 |
|
| 75 |
dnl When APR stores the dependent libs in the .la file, we don't need |
75 |
SVN_APRUTIL_LIBS="`$apu_config --link-libtool`" |
| 76 |
dnl --libs. |
|
|
| 77 |
SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" |
| 78 |
if test $? -ne 0; then |
76 |
if test $? -ne 0; then |
| 79 |
AC_MSG_ERROR([apu-config --link-libtool --libs failed]) |
77 |
AC_MSG_ERROR([apu-config --link-libtool failed]) |
| 80 |
fi |
78 |
fi |
| 81 |
|
79 |
|
| 82 |
SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`" |
80 |
SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`" |
| 83 |
if test $? -ne 0; then |
81 |
if test $? -ne 0; then |
| 84 |
AC_MSG_ERROR([apu-config --link-ld --libs failed]) |
82 |
AC_MSG_ERROR([apu-config --link-ld failed]) |
| 85 |
fi |
83 |
fi |
| 86 |
|
84 |
|
| 87 |
AC_SUBST(SVN_APRUTIL_INCLUDES) |
85 |
AC_SUBST(SVN_APRUTIL_INCLUDES) |
| 88 |
-- build/ac-macros/apr.m4 |
86 |
++ build/ac-macros/apr.m4 |
|
Lines 74-89
Link Here
|
| 74 |
AC_MSG_ERROR([apr-config --prefix failed]) |
74 |
AC_MSG_ERROR([apr-config --prefix failed]) |
| 75 |
fi |
75 |
fi |
| 76 |
|
76 |
|
| 77 |
dnl When APR stores the dependent libs in the .la file, we don't need |
77 |
SVN_APR_LIBS="`$apr_config --link-libtool`" |
| 78 |
dnl --libs. |
|
|
| 79 |
SVN_APR_LIBS="`$apr_config --link-libtool --libs`" |
| 80 |
if test $? -ne 0; then |
78 |
if test $? -ne 0; then |
| 81 |
AC_MSG_ERROR([apr-config --link-libtool --libs failed]) |
79 |
AC_MSG_ERROR([apr-config --link-libtool failed]) |
| 82 |
fi |
80 |
fi |
| 83 |
|
81 |
|
| 84 |
SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`" |
82 |
SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`" |
| 85 |
if test $? -ne 0; then |
83 |
if test $? -ne 0; then |
| 86 |
AC_MSG_ERROR([apr-config --link-ld --libs failed]) |
84 |
AC_MSG_ERROR([apr-config --link-ld failed]) |
| 87 |
fi |
85 |
fi |
| 88 |
|
86 |
|
| 89 |
SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`" |
87 |
SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`" |
| 90 |
-- build/ac-macros/berkeley-db.m4 |
88 |
++ build/ac-macros/berkeley-db.m4 |
|
Lines 218-222
Link Here
|
| 218 |
|
218 |
|
| 219 |
CPPFLAGS="$svn_lib_berkeley_db_try_save_cppflags" |
219 |
CPPFLAGS="$svn_lib_berkeley_db_try_save_cppflags" |
| 220 |
LIBS="$svn_lib_berkeley_db_try_save_libs" |
220 |
LIBS="$svn_lib_berkeley_db_try_save_libs" |
|
|
221 |
SVN_DB_LIBS="$svn_apu_bdb_lib" |
| 221 |
] |
222 |
] |
| 222 |
) |
223 |
) |
