On Sat, 22 Sep 2001 14:22:28 -0700
Greg Stein <gstein@lyra.org> wrote:
> Here is an updated patch for switching to autoconf 2.52/libtool 1.4.
...
> I've also fixed up the invocation of Neon to strip the --config-cache or -C
> switches from the command line. Neon doesn't like them at all. (until it
> upgrades to autoconf 2.52 also)
...
--- ./SVN/text-base/configure.in Thu Sep 20 04:07:07 2001
+++ ./configure.in Sat Sep 22 14:06:37 2001
@@ -120,6 +124,10 @@
else
args="--disable-shared"
fi
+
+ # neon uses an old autoconf which does not understand the -C and
+ # --config-cache arguments. strip them from the args passed down.
+ ac_configure_args="`echo $ac_configure_args | sed 's/-C//' | sed 's/--config-cache//'`"
APR_SUBDIR_CONFIG(neon, $args --with-expat="$abs_srcdir/expat-lite/libexpat.la")
How about we just regenerate the neon build scripts instead of trying to hack
around the fact that neon still uses autoconf 2.13? If we add the following
to subversion's autogen.sh it will patch up a little problem in neon 0.15.3
and then regenerate with autoconf 2.52 and libtool 1.4.2.
Index: autogen.sh
===================================================================
--- SVN/text-base/autogen.sh Mon Sep 10 09:49:53 2001
+++ autogen.sh Mon Sep 24 03:03:45 2001
@@ -158,6 +165,30 @@
echo "Creating config files for APR..."
(cd apr; ./buildconf) # this is apr's equivalent of autogen.sh
fi
+
+# Regenerate configuration files for neon, note that we need to
+# do a little hack here to apply a neon patch so that autoheader
+# will work properly. This should be removed once we upgrade
+# to a version of neon newer than 1.15.3
+(cd neon
+ echo "regenerating build scripts in neon"
+ rm -f aclocal.m4 config.h.in ltconfig ltmain.sh
+ if test ! -f configure.in.patch ; then
+ echo "patching configure.in"
+ cat > configure.in.patch <<EOF
+--- configure.in Mon Sep 24 02:46:57 2001
++++ configure.in Mon Sep 24 02:47:32 2001
+@@ -7 +7 @@
+-AC_DEFINE([_GNU_SOURCE])
++AC_DEFINE([_GNU_SOURCE], 1, [Unconditionally define _GNU_SOURCE])
+EOF
+ patch -p 0 < configure.in.patch
+ fi
+ aclocal -I macros
+ autoheader
+ libtoolize --copy >/dev/null 2>&1
+ autoconf
+)
# If we have a config.cache file, toss it if the configure script has
# changed, or if we just built it for the first time.
cheers
Mo DeJong
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:42 2006