You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/01/15 15:49:07 UTC
cvs commit: apr-util/xml/expat buildconf.sh
jorton 2004/01/15 06:49:07
Modified: xml/expat buildconf.sh
Log:
Fix build with recent libtool HEAD:
* xml/expat/buildconf.sh: Re-order to run libtoolize before creating
aclocal.m4; use libtool.m4 from the cwd after running libtoolize, when
found. Also add ltsugar.m4 to aclocal.m4 when found.
Revision Changes Path
1.12 +26 -9 apr-util/xml/expat/buildconf.sh
Index: buildconf.sh
===================================================================
RCS file: /home/cvs/apr-util/xml/expat/buildconf.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -d -u -r1.11 -r1.12
--- buildconf.sh 17 Jun 2003 20:51:47 -0000 1.11
+++ buildconf.sh 15 Jan 2004 14:49:07 -0000 1.12
@@ -1,21 +1,13 @@
#! /bin/sh
#
-# Build aclocal.m4 from libtool's libtool.m4
+# Find libtoolize
#
libtoolize=`conftools/PrintPath glibtoolize libtoolize`
if [ "x$libtoolize" = "x" ]; then
echo "libtoolize not found in path"
exit 1
fi
-ltpath=`dirname $libtoolize`
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-echo "Incorporating $ltfile into aclocal.m4 ..."
-echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
-echo "dnl edits here will be lost" >> aclocal.m4
-cat $ltfile >> aclocal.m4
-
-cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
#
# Create the libtool helper files
@@ -30,8 +22,33 @@
# Remove any libtool files so one can switch between libtool 1.3
# and libtool 1.4 by simply rerunning the buildconf script.
(cd conftools ; rm -f ltconfig ltmain.sh)
+rm -f aclocal.m4 libtool.m4 ltsugar.m4
$libtoolize --copy --automake
+
+#
+# Build aclocal.m4 from libtool's libtool.m4
+#
+if [ -f libtool.m4 ]; then
+ ltfile=libtool.m4
+else
+ ltpath=`dirname $libtoolize`
+ ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+fi
+echo "Incorporating $ltfile into aclocal.m4 ..."
+echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
+echo "dnl edits here will be lost" >> aclocal.m4
+cat $ltfile >> aclocal.m4
+
+if [ -f ltsugar.m4 ]; then
+ echo "Incorporating ltsugar.m4 into aclocal.m4 ..."
+ cat ltsugar.m4 >> aclocal.m4
+fi
+
+# Clean up again
+rm -f libtool.m4 ltsugar.m4
+
+cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
#
# Generate the autoconf header template (config.h.in) and ./configure