You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2010/07/26 19:41:11 UTC
svn commit: r979383 - in /apr/apr-util/branches/0.9.x: CHANGES
xml/expat/buildconf.sh xml/expat/configure.in
Author: rjung
Date: Mon Jul 26 17:41:11 2010
New Revision: 979383
URL: http://svn.apache.org/viewvc?rev=979383&view=rev
Log:
1) Make buildconf in expat libtool 2 compatible.
- Add AC_CONFIG_MACRO_DIR to configure.in.
So libtoolize does copy in its m4 files.
Otherwise libtoolize --copy doesn't copy them.
- Add all of the libtool m4 files to aclocal.m4.
The single libtool.m4 file used by libtool 1
has been split into five files by libtool 2 and
we need them all.
Backport of r979102 (1.5 branch),
r979103 (1.4 branch) resp. r979222 (1.3 branch).
2) Prefer libtool 1.x.
Backport of r743784 (1.5 branch).
Modified:
apr/apr-util/branches/0.9.x/CHANGES
apr/apr-util/branches/0.9.x/xml/expat/buildconf.sh
apr/apr-util/branches/0.9.x/xml/expat/configure.in
Modified: apr/apr-util/branches/0.9.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/CHANGES?rev=979383&r1=979382&r2=979383&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/0.9.x/CHANGES [utf-8] Mon Jul 26 17:41:11 2010
@@ -5,6 +5,12 @@ Changes with APR-util 0.9.18
Fix overflow in rmm, where size alignment was taking place.
[Matt Lewis <ma...@google.com>, Sander Striker]
+ *) Make bundled expat compatible with libtool 2.x.
+ This only affects the release process. [Rainer Jung]
+
+ *) Prefer libtool 1.x when searching for libtool in
+ bundled expat release process. [Rainer Jung, Jim Jagielski]
+
*) Improve platform detection for bundled expat by updating
config.guess and config.sub. [Rainer Jung]
Modified: apr/apr-util/branches/0.9.x/xml/expat/buildconf.sh
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/xml/expat/buildconf.sh?rev=979383&r1=979382&r2=979383&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/xml/expat/buildconf.sh (original)
+++ apr/apr-util/branches/0.9.x/xml/expat/buildconf.sh Mon Jul 26 17:41:11 2010
@@ -1,29 +1,14 @@
#! /bin/sh
#
-# Build aclocal.m4 from libtool's libtool.m4
+# Find libtoolize. Prefer 1.x versions.
#
-libtoolize=`conftools/PrintPath glibtoolize libtoolize`
+libtoolize=`conftools/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14`
if [ "x$libtoolize" = "x" ]; then
echo "libtoolize not found in path"
exit 1
fi
-# Remove any m4 cache and libtool files so one can switch between
-# autoconf and libtool versions by simply rerunning the buildconf script.
-#
-(cd conftools ; rm -f ltconfig ltmain.sh)
-rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
-
-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
#
@@ -34,9 +19,47 @@ cross_compile_warning="warning: AC_TRY_R
# want to ensure is used.
echo "Copying libtool helper files ..."
+# Remove any m4 cache and libtool files so one can switch between
+# autoconf and libtool versions by simply rerunning the buildconf script.
+#
+(cd conftools ; rm -f ltconfig ltmain.sh)
+rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
+
$libtoolize --copy --automake
#
+# find libtool.m4
+#
+if [ ! -f libtool.m4 ]; then
+ ltpath=`dirname $libtoolize`
+ ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+ if [ -f $ltfile ]; then
+ echo "libtool.m4 found at $ltfile"
+ cp $ltfile libtool.m4
+ else
+ echo "libtool.m4 not found - aborting!"
+ exit 1
+ fi
+fi
+
+#
+# Build aclocal.m4 from libtool's m4 files
+#
+echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
+echo "dnl edits here will be lost" >> aclocal.m4
+
+for m4file in libtool.m4 ltsugar.m4 ltoptions.m4 ltversion.m4 lt~obsolete.m4
+do
+ if [ -f $m4file ]; then
+ echo "Incorporating $m4file into aclocal.m4 ..."
+ cat $m4file >> aclocal.m4
+ rm -f $m4file
+ fi
+done
+
+cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
+
+#
# Generate the autoconf header template (config.h.in) and ./configure
#
echo "Creating config.h.in ..."
Modified: apr/apr-util/branches/0.9.x/xml/expat/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/xml/expat/configure.in?rev=979383&r1=979382&r2=979383&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/xml/expat/configure.in (original)
+++ apr/apr-util/branches/0.9.x/xml/expat/configure.in Mon Jul 26 17:41:11 2010
@@ -12,6 +12,7 @@ dnl
AC_INIT(Makefile.in)
AC_CONFIG_AUX_DIR(conftools)
+AC_CONFIG_MACRO_DIR(.)
dnl
dnl Follow the GNU/Linux convention of odd number minor version for