82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
|
--- configure.ac
|
||
|
|
+++ configure.ac
|
||
|
|
@@ -234,6 +234,8 @@
|
||
|
|
AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH,
|
||
|
|
[The desired patch version for the Berkeley DB])
|
||
|
|
|
||
|
|
+AC_SUBST(SVN_DB_LIBS)
|
||
|
|
+
|
||
|
|
SVN_LIB_SASL
|
||
|
|
|
||
|
|
if test "$svn_lib_sasl" = "yes"; then
|
||
|
|
--- Makefile.in
|
||
|
|
+++ Makefile.in
|
||
|
|
@@ -40,9 +40,10 @@
|
||
|
|
NEON_LIBS = @NEON_LIBS@
|
||
|
|
SVN_APR_LIBS = @SVN_APR_LIBS@
|
||
|
|
SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
|
||
|
|
-SVN_DB_LIBS =
|
||
|
|
-SVN_SERF_LIBS = @SVN_SERF_LIBS@
|
||
|
|
+SVN_DB_LIBS = @SVN_DB_LIBS@
|
||
|
|
SVN_SASL_LIBS = @SVN_SASL_LIBS@
|
||
|
|
+SVN_SERF_LIBS = @SVN_SERF_LIBS@
|
||
|
|
+SVN_XML_LIBS = -lexpat
|
||
|
|
SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
|
||
|
|
|
||
|
|
LIBS = @LIBS@
|
||
|
|
--- build/ac-macros/aprutil.m4
|
||
|
|
+++ build/ac-macros/aprutil.m4
|
||
|
|
@@ -72,16 +72,14 @@
|
||
|
|
AC_MSG_ERROR([apu-config --includes failed])
|
||
|
|
fi
|
||
|
|
|
||
|
|
- dnl When APR stores the dependent libs in the .la file, we don't need
|
||
|
|
- dnl --libs.
|
||
|
|
- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
|
||
|
|
+ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
|
||
|
|
if test $? -ne 0; then
|
||
|
|
- AC_MSG_ERROR([apu-config --link-libtool --libs failed])
|
||
|
|
+ AC_MSG_ERROR([apu-config --link-libtool failed])
|
||
|
|
fi
|
||
|
|
|
||
|
|
- SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
|
||
|
|
+ SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`"
|
||
|
|
if test $? -ne 0; then
|
||
|
|
- AC_MSG_ERROR([apu-config --link-ld --libs failed])
|
||
|
|
+ AC_MSG_ERROR([apu-config --link-ld failed])
|
||
|
|
fi
|
||
|
|
|
||
|
|
AC_SUBST(SVN_APRUTIL_INCLUDES)
|
||
|
|
--- build/ac-macros/apr.m4
|
||
|
|
+++ build/ac-macros/apr.m4
|
||
|
|
@@ -74,16 +74,14 @@
|
||
|
|
AC_MSG_ERROR([apr-config --prefix failed])
|
||
|
|
fi
|
||
|
|
|
||
|
|
- dnl When APR stores the dependent libs in the .la file, we don't need
|
||
|
|
- dnl --libs.
|
||
|
|
- SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
|
||
|
|
+ SVN_APR_LIBS="`$apr_config --link-libtool`"
|
||
|
|
if test $? -ne 0; then
|
||
|
|
- AC_MSG_ERROR([apr-config --link-libtool --libs failed])
|
||
|
|
+ AC_MSG_ERROR([apr-config --link-libtool failed])
|
||
|
|
fi
|
||
|
|
|
||
|
|
- SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
|
||
|
|
+ SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`"
|
||
|
|
if test $? -ne 0; then
|
||
|
|
- AC_MSG_ERROR([apr-config --link-ld --libs failed])
|
||
|
|
+ AC_MSG_ERROR([apr-config --link-ld failed])
|
||
|
|
fi
|
||
|
|
|
||
|
|
SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`"
|
||
|
|
--- build/ac-macros/berkeley-db.m4
|
||
|
|
+++ build/ac-macros/berkeley-db.m4
|
||
|
|
@@ -218,5 +218,6 @@
|
||
|
|
|
||
|
|
CPPFLAGS="$svn_lib_berkeley_db_try_save_cppflags"
|
||
|
|
LIBS="$svn_lib_berkeley_db_try_save_libs"
|
||
|
|
+ SVN_DB_LIBS="$svn_apu_bdb_lib"
|
||
|
|
]
|
||
|
|
)
|