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

[wr...@apache.org]

Author: wrowe
Date: Wed Nov 18 03:45:35 2009
New Revision: 881660

URL: http://svn.apache.org/viewvc?rev=881660&view=rev
Log:
Simply revert until I have 2.2.6 libtool with 2.63 autoconf in front of me

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