svn commit: r1005998 - /apr/apr-util/branches/0.9.x/xml/expat/buildconf.sh

[rj...@apache.org]

Author: rjung
Date: Fri Oct  8 20:07:02 2010
New Revision: 1005998

URL: http://svn.apache.org/viewvc?rev=1005998&view=rev
Log:
Bring buildconf.sh in xml/expat in sync with 1.3.x:

- Make sure we clean up all m4 files at the right
  places before and after run
- copy libtool.m4 to right directory when using libtool 1

Backport of r1002733.

Modified:
    apr/apr-util/branches/0.9.x/xml/expat/buildconf.sh

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=1005998&r1=1005997&r2=1005998&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 Fri Oct  8 20:07:02 2010
@@ -22,8 +22,10 @@ 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
+m4files='lt~obsolete.m4 ltversion.m4 ltoptions.m4 argz.m4 ltsugar.m4 libtool.m4'
+
+(cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files)
+rm -rf autom4te*.cache aclocal.m4
 
 $libtoolize --copy --automake
 
@@ -35,7 +37,7 @@ if [ ! -f libtool.m4 ]; then
   ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
   if [ -f $ltfile ]; then
     echo "libtool.m4 found at $ltfile"
-    cp $ltfile libtool.m4
+    cp $ltfile conftools/libtool.m4
   else
     echo "libtool.m4 not found - aborting!"
     exit 1
@@ -48,8 +50,9 @@ fi
 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
+for m4file in $m4files
 do
+  m4file=conftools/$m4file
   if [ -f $m4file ]; then
     echo "Incorporating $m4file into aclocal.m4 ..."
     cat $m4file >> aclocal.m4
@@ -70,6 +73,6 @@ echo "Creating configure ..."
 ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
 
 # Remove autoconf caches
-rm -rf autom4te*.cache
+rm -rf autom4te*.cache aclocal.m4
 
 exit 0