[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[Patch] Issue 751 resolved RESEND

From: Patrick Mayweg <mayweg_at_qint.de>
Date: 2003-06-04 12:50:39 CEST

Hi,
this is a resend of my mail from the 27th May. I did not receive any
answers to the first mail. I need that patch for the java bindings. If
nobody objects till Monday, I will commit the patch.
Regards,
Patrick

Hi,
I was bugged with issue 751 (need an svn-config file). My problem were
the references to $(abs_srcdir) and $(absbuilddir) in the svn-config
script if a local neon is used. The reason for the problem is the use of

the same configure substitution variables (NEON_LIBS and
SVN_NEON_INCLUDES) for the Makefile and svn-config. Both files have
different syntax and different predefined variables. So I split both
variables into the original and a _SVN_CONFIG variant.
Regards,
Patrick Mayweg

Modified:
    build/ac-macros/neon.m4
    svn-config.in
Log:
    Fix for issue 751 (references to abs_srcdir and abs_builddir in
svn-config)

* build/ac-macros/neon.m4
    added SVN_NEON_INCLUDES_SVN_CONFIG for use in svn-config script
    added NEON_LIBS_SVN_CONFIG for use in svn-config script

* svn-config.in
    changed SVN_NEON_INCLUDES to SVN_NEON_INCLUDES_SVN_CONFIG
    changed NEON_LIBS to NEON_LIBS_SVN_CONFIG

Index: build/ac-macros/neon.m4
===================================================================
--- build/ac-macros/neon.m4 (revision 6062)
+++ build/ac-macros/neon.m4 (working copy)
@@ -53,6 +53,8 @@
           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_SVN_CONFIG="-I$abs_srcdir/neon/src"
+ NEON_LIBS_SVN_CONFIG="$abs_builddir/neon/src/libneon.la"
 
 dnl Configure neon --------------------------
           # The arguments passed to this configure script are passed down to
@@ -85,8 +87,11 @@
             changequote(<<, >>)dnl
             CFLAGS="$CFLAGS `$SHELL $abs_builddir/neon/neon-config --cflags | sed -e 's/-I[^ ]*//g'`"
             SVN_NEON_INCLUDES="$SVN_NEON_INCLUDES `$SHELL $abs_builddir/neon/neon-config --cflags | sed -e 's/-D[^ ]*//g'`"
+ svn_lib_neon="yes"
+ NEON_LIBS_SVN_CONFIG="$NEON_LIBS_SVN_CONFIG $NEON_LIBS_NEW"
+ SVN_NEON_INCLUDES_SVN_CONFIG="$SVN_NEON_INCLUDES_SVN_CONFIG `$SHELL $abs_builddir/neon/neon-config --cflags | sed -e 's/-D[^ ]*//g'`"
             changequote([, ])dnl
- svn_lib_neon="yes"
+
           fi
 
           SVN_SUBDIRS="$SVN_SUBDIRS neon"
@@ -108,6 +113,8 @@
   
   AC_SUBST(SVN_NEON_INCLUDES)
   AC_SUBST(NEON_LIBS)
+ AC_SUBST(SVN_NEON_INCLUDES_SVN_CONFIG)
+ AC_SUBST(NEON_LIBS_SVN_CONFIG)
 ])
 
 dnl SVN_NEON_CONFIG()
Index: svn-config.in
===================================================================
--- svn-config.in (revision 6062)
+++ svn-config.in (working copy)
@@ -22,10 +22,10 @@
 libdir="@libdir@"
 includedir="@includedir@"
 
-LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @SVN_DB_LIBS@ @LIBS@"
+LIBS="@NEON_LIBS_SVN_CONFIG@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @SVN_DB_LIBS@ @LIBS@"
 CFLAGS="@CFLAGS@"
 CPPFLAGS="@CPPFLAGS@"
-INCLUDES="@SVN_NEON_INCLUDES@ @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@"
+INCLUDES="@SVN_NEON_INCLUDES_SVN_CONFIG@ @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@"
 LDFLAGS="@LDFLAGS@"
 
 SVN_SOURCE_DIR="@abs_srcdir@"

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 4 12:51:28 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.