apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1002733 - /apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh
Date Wed, 29 Sep 2010 16:57:31 GMT
Author: rjung
Date: Wed Sep 29 16:57:31 2010
New Revision: 1002733

URL: http://svn.apache.org/viewvc?rev=1002733&view=rev
Log:
Copy expat buildconf changes (r1002732)
from 1.5 branch:

- Remove force flag from libtoolize for expat.
  Otherwise we will overwrite our config.(guess|sub).
- 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

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

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=1002733&r1=1002732&r2=1002733&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 Sep 29 16:57:31 2010
@@ -22,10 +22,12 @@ 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'
 
-$libtoolize --copy --automake --force
+(cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files)
+rm -rf autom4te*.cache aclocal.m4
+
+$libtoolize --copy --automake
 
 #
 # find libtool.m4
@@ -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,11 +50,12 @@ 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 lt~obsolete.m4 ltversion.m4 ltoptions.m4 argz.m4 ltsugar.m4 libtool.m4
+for m4file in $m4files
 do
-  if [ -f conftools/$m4file ]; then
-    echo "Incorporating conftools/$m4file into aclocal.m4 ..."
-    cat conftools/$m4file >> aclocal.m4
+  m4file=conftools/$m4file
+  if [ -f $m4file ]; then
+    echo "Incorporating $m4file into aclocal.m4 ..."
+    cat $m4file >> aclocal.m4
     rm -f $m4file
   fi
 done
@@ -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



Mime
View raw message