apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r388829 - /apr/apr-util/trunk/xml/expat/buildconf.sh
Date Sat, 25 Mar 2006 21:08:56 GMT
Author: wrowe
Date: Sat Mar 25 13:08:55 2006
New Revision: 388829

URL: http://svn.apache.org/viewcvs?rev=388829&view=rev
Log:

  As observed by jerenkranz - do not flush our .m4 state between running
  libtoolize and invoking autofoo.  In fact we already pre-flushed any
  but a prior existing autom4te.cache, so add that and clarify the docs,
  reverting 388604.
  

Modified:
    apr/apr-util/trunk/xml/expat/buildconf.sh

Modified: apr/apr-util/trunk/xml/expat/buildconf.sh
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/xml/expat/buildconf.sh?rev=388829&r1=388828&r2=388829&view=diff
==============================================================================
--- apr/apr-util/trunk/xml/expat/buildconf.sh (original)
+++ apr/apr-util/trunk/xml/expat/buildconf.sh Sat Mar 25 13:08:55 2006
@@ -19,10 +19,11 @@
 # want to ensure is used.
 echo "Copying libtool helper files ..."
 
-# Remove any libtool files so one can switch between libtool 1.3
-# and libtool 1.4 by simply rerunning the buildconf script.
+# 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 -f aclocal.m4 libtool.m4 ltsugar.m4
+rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
 
 $libtoolize --copy --automake
 
@@ -49,9 +50,6 @@
 rm -f libtool.m4 ltsugar.m4
 
 cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
-
-# Remove aclocal.m4 as it'll break some builds...
-rm -rf aclocal.m4 autom4te*.cache
 
 #
 # Generate the autoconf header template (config.h.in) and ./configure



Mime
View raw message