I'm trying to get svn-config to work. This patch has the modest goal of
making --link-ld and --link-libtool give the linker args for externally
linked apr, aprutil, and neon. If I'm ambitious later, I'll try to do
ones compiled from within the Subversion tree.
Question: Is only svn_client used by clients? Otherwise, I can make a
--use=svn_client,svn_wc argument or something.
If yes, are these svn_client's correct deps (from rapidsvn's Makefile)?
-lsvn_client-1 -lsvn_wc-1 -lsvn_ra-1 -lsvn_delta-1 -lsvn_subr-1
Thanks,
Scott
Fix svn-config to generate library options for external apr, aprutil, and
neon. Still doesn't link against Subversion itself.
* ac-helpers/aprutil.m4, ac-helpers/apr.m4:
Renamed SVN_APRUTIL_EXPORT_LIBS to SVN_APRUTIL_LD_LIBS.
(SVN_APRUTIL_LIBS is also used for export with "svn-config --link-libtool")
* ac-helpers/neon.m4:
Substitute $abs_(src|build)dir in configure, as Makefile and svn-config have
different variable expansion rules.
* svn-config.in:
Understand "--link-libtool" and "--link-ld".
Index: ./ac-helpers/aprutil.m4
===================================================================
--- ./ac-helpers/aprutil.m4
+++ ./ac-helpers/aprutil.m4 Sun Jul 28 13:02:40 2002
@@ -45,14 +45,14 @@
AC_MSG_ERROR([apu-config --link-libtool --libs failed])
fi
- SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
+ SVN_APRUTIL_LD_LIBS="`$apu_config --link-ld --libs`"
if test $? -ne 0; then
AC_MSG_ERROR([apu-config --link-ld --libs failed])
fi
AC_SUBST(SVN_APRUTIL_INCLUDES)
AC_SUBST(SVN_APRUTIL_LIBS)
- AC_SUBST(SVN_APRUTIL_EXPORT_LIBS)
+ AC_SUBST(SVN_APRUTIL_LD_LIBS)
])
dnl SVN_DOWNLOAD_APRUTIL()
Index: ./ac-helpers/apr.m4
===================================================================
--- ./ac-helpers/apr.m4
+++ ./ac-helpers/apr.m4 Sun Jul 28 12:59:10 2002
@@ -50,14 +50,14 @@
AC_MSG_ERROR([apr-config --link-libtool --libs failed])
fi
- SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
+ SVN_APR_LD_LIBS="`$apr_config --link-ld --libs`"
if test $? -ne 0; then
AC_MSG_ERROR([apr-config --link-ld --libs failed])
fi
AC_SUBST(SVN_APR_INCLUDES)
AC_SUBST(SVN_APR_LIBS)
- AC_SUBST(SVN_APR_EXPORT_LIBS)
+ AC_SUBST(SVN_APR_LD_LIBS)
])
dnl SVN_DOWNLOAD_APR()
Index: ./ac-helpers/neon.m4
===================================================================
--- ./ac-helpers/neon.m4
+++ ./ac-helpers/neon.m4 Sun Jul 28 12:47:01 2002
@@ -48,8 +48,8 @@
case "$NEON_VERSION" in
$NEON_WANTED_REGEX)
echo "Using neon found in source directory."
- SVN_NEON_INCLUDES=-'I$(abs_srcdir)/neon/src'
- NEON_LIBS="\$(abs_builddir)/neon/src/libneon.la"
+ SVN_NEON_INCLUDES=-"I$abs_srcdir/neon/src"
+ NEON_LIBS="$abs_builddir/neon/src/libneon.la"
dnl Configure neon --------------------------
# The arguments passed to this configure script are passed down to
Index: ./svn-config.in
===================================================================
--- ./svn-config.in
+++ ./svn-config.in Mon Jul 29 10:49:02 2002
@@ -22,7 +22,9 @@
libdir="@libdir@"
includedir="@includedir@"
-LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @SVN_DB_LIBS@ @LIBS@"
+LIBTOOL_LIBS="@NEON_LIBS@ @SVN_APRUTIL_LIBS@ @SVN_APR_LIBS@ @SVN_DB_LIBS@"
+LD_LIBS="@NEON_LIBS@ @SVN_APRUTIL_LD_LIBS@ @SVN_APR_LD_LIBS@ @SVN_DB_LIBS@"
+LIBS="@LIBS@"
CFLAGS="@CFLAGS@"
CPPFLAGS="@CPPFLAGS@"
INCLUDES="@SVN_NEON_INCLUDES@ @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@"
@@ -44,8 +46,8 @@
--ldflags print linker flags
--libs print library information
--srcdir print SVN source directory
- --link-ld [NOT IMPL] print link switch(es) for linking to SVN
- --link-libtool [NOT IMPL] print the libtool inputs for linking to SVN
+ --link-ld print link switch(es) for linking to SVN
+ --link-libtool print the libtool inputs for linking to SVN
--help print this help
When linking with libtool, an application should do something like:
@@ -102,6 +104,12 @@
--cppflags)
flags="$flags $CPPFLAGS"
;;
+ --link-libtool)
+ flags="$flags $LIBTOOL_LIBS"
+ ;;
+ --link-ld)
+ flags="$flags $LD_LIBS"
+ ;;
--libs)
flags="$flags $LIBS"
;;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 29 18:11:58 2002