Re: CVS update: subversion configure.in

WARNING: this requires a patch to Neon before this will work. Joe is going
to be releasing a Neon 0.7.5 sometime here soon. Until then, you can apply
the patch (to Neon's configure script) attached inline under my signature.

On Tue, Oct 10, 2000 at 05:13:11AM -0000, gstein@tigris.org wrote:
> User: gstein
> Date: 00/10/09 22:13:11
>
> Modified: . configure.in
> Log:
> tell Neon that we will be using a libtool version of libexpat.
>
> Revision Changes Path
> 1.36 +1 -1 subversion/configure.in
>
> Index: configure.in
> ===================================================================
> RCS file: /cvs/subversion/configure.in,v
> retrieving revision 1.35
> retrieving revision 1.36
> diff -u -r1.35 -r1.36
> --- configure.in 2000/10/07 08:24:46 1.35
> +++ configure.in 2000/10/10 05:13:11 1.36
> @@ -37,7 +37,7 @@
> if test "$enable_subdir_config" = "yes"; then
> RUN_SUBDIR_CONFIG_NOW(apr)
> expat_absdir=`cd $srcdir/expat-lite ; pwd`
> - RUN_SUBDIR_CONFIG_NOW(neon, --with-expat=$expat_absdir)
> + RUN_SUBDIR_CONFIG_NOW(neon, --with-expat=$expat_absdir/libexpat.la)
> fi

-- 
Greg Stein, http://www.lyra.org/
--- neon-0.7.4/configure	Sat Oct  7 11:29:28 2000
+++ neon/configure	Mon Oct  9 04:07:49 2000
@@ -2133,13 +2125,18 @@
   withval="$with_expat"
   
 	if test "$withval" != "no"; then
+		case "$withval" in
+		*/libexpat.la)
+			neon_using_libtool_expat=yes
+			withval=`echo $withval | sed 's:/libexpat.la$::'`
+		esac
 		if test -r "$withval/xmlparse.h"; then
 			cat >> confdefs.h <<\EOF
 #define HAVE_EXPAT 1
 EOF
 
 			CFLAGS="$CFLAGS -I$withval"
-			if test -r "$withval/libexpat.la"; then
+			if test -n "$neon_using_libtool_expat"; then
 				LIBS="$LIBS $withval/libexpat.la"
 			else
 				LIBS="$LIBS -L$withval -lexpat"