svn commit: r835635 - in /apr/apr-util/branches/1.3.x: buildconf xml/expat/buildconf.sh xml/expat/configure.in

[wr...@apache.org]

Author: wrowe
Date: Thu Nov 12 23:20:30 2009
New Revision: 835635

URL: http://svn.apache.org/viewvc?rev=835635&view=rev
Log:
Fix expat libtool'ization (2.2.6) and allow buildconf --verbose'ity

Modified:
    apr/apr-util/branches/1.3.x/buildconf
    apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh
    apr/apr-util/branches/1.3.x/xml/expat/configure.in

Modified: apr/apr-util/branches/1.3.x/buildconf
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/buildconf?rev=835635&r1=835634&r2=835635&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/buildconf (original)
+++ apr/apr-util/branches/1.3.x/buildconf Thu Nov 12 23:20:30 2009
@@ -17,6 +17,11 @@
 #
 #
 
+if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
+    verbose="--verbose"
+    shift
+fi
+
 # Default place to look for apr source.  Can be overridden with 
 #   --with-apr=[directory]
 apr_src_dir=../apr
@@ -67,11 +72,11 @@
 # Generate the autoconf header (include/apu_config.h) and ./configure
 #
 echo "Creating include/private/apu_config.h ..."
-${AUTOHEADER:-autoheader}
+${AUTOHEADER:-autoheader} $verbose
 
 echo "Creating configure ..."
 ### do some work to toss config.cache?
-if ${AUTOCONF:-autoconf}; then
+if ${AUTOCONF:-autoconf} $verbose; then
   :
 else
   echo "autoconf failed"
@@ -82,14 +87,14 @@
 # Generate build-outputs.mk for the build system
 #
 echo "Generating 'make' outputs ..."
-$apr_src_dir/build/gen-build.py make
+$apr_src_dir/build/gen-build.py $verbose make
 
 #
 # If Expat has been bundled, then go and configure the thing
 #
 if [ -f xml/expat/buildconf.sh ]; then
   echo "Invoking xml/expat/buildconf.sh ..."
-  (cd xml/expat; ./buildconf.sh)
+  (cd xml/expat; ./buildconf.sh $verbose)
 fi
 
 # Remove autoconf cache again

Modified: apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh?rev=835635&r1=835634&r2=835635&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh Thu Nov 12 23:20:30 2009
@@ -1,5 +1,10 @@
 #! /bin/sh
 
+if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
+    verbose="--verbose"
+    shift
+fi
+
 #
 # Find libtoolize
 #
@@ -25,7 +30,7 @@
 (cd conftools ; rm -f ltconfig ltmain.sh)
 rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
 
-$libtoolize --copy --automake
+$libtoolize --copy --automake --force $verbose
 
 #
 # Build aclocal.m4 from libtool's libtool.m4
@@ -42,12 +47,12 @@
 cat $ltfile >> aclocal.m4
 
 if [ -f ltsugar.m4 ]; then
-  echo "Incorporating ltsugar.m4 into aclocal.m4 ..."
-  cat ltsugar.m4 >> aclocal.m4
+   rm -f conftools/ltsugar.m4
+   mv ltsugar.m4 conftools/ltsugar.m4
 fi
 
-# Clean up again
-rm -f libtool.m4 ltsugar.m4
+# Clean up any leftovers
+rm -f aclocal.m4 libtool.m4
 
 cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
 
@@ -55,11 +60,11 @@
 # Generate the autoconf header template (config.h.in) and ./configure
 #
 echo "Creating config.h.in ..."
-${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
+${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning"
 
 echo "Creating configure ..."
 ### do some work to toss config.cache?
-${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
+${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning"
 
 # Remove autoconf caches
 rm -rf autom4te*.cache

Modified: apr/apr-util/branches/1.3.x/xml/expat/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/configure.in?rev=835635&r1=835634&r2=835635&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/configure.in (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/configure.in Thu Nov 12 23:20:30 2009
@@ -12,6 +12,14 @@
 
 AC_INIT(Makefile.in)
 AC_CONFIG_AUX_DIR(conftools)
+AC_CONFIG_MACRO_DIR(conftools)
+
+sinclude(conftools/libtool.m4)
+sinclude(conftools/ltsugar.m4)
+sinclude(conftools/argz.m4)
+sinclude(conftools/ltoptions.m4)
+sinclude(conftools/ltversion.m4)
+sinclude(conftools/lt~obsolete.m4)
 
 dnl
 dnl Follow the GNU/Linux convention of odd number minor version for