From commits-return-11394-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sun Jul 25 19:49:01 2010 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 29585 invoked from network); 25 Jul 2010 19:49:00 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 Jul 2010 19:49:00 -0000 Received: (qmail 73289 invoked by uid 500); 25 Jul 2010 19:49:00 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 73181 invoked by uid 500); 25 Jul 2010 19:49:00 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 73174 invoked by uid 99); 25 Jul 2010 19:49:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Jul 2010 19:49:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Jul 2010 19:48:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4AE07238899C; Sun, 25 Jul 2010 19:48:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r979103 - in /apr/apr-util/branches/1.4.x/xml/expat: buildconf.sh configure.in Date: Sun, 25 Jul 2010 19:48:04 -0000 To: commits@apr.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100725194804.4AE07238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Sun Jul 25 19:48:03 2010 New Revision: 979103 URL: http://svn.apache.org/viewvc?rev=979103&view=rev Log: Make buildconf in expat libtool 2 compatible. - Add AC_CONFIG_MACRO_DIR to configure.in. So libtoolize does copy in its m4 files. Otherwise libtoolize --copy doesn't copy them. - Add all of the libtool m4 files to aclocal.m4. The single libtool.m4 file used by libtool 1 has been split into five files by libtool 2 and we need them all. Backport of r979102 from tne 1.5.x branch. Modified: apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh apr/apr-util/branches/1.4.x/xml/expat/configure.in Modified: apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh?rev=979103&r1=979102&r2=979103&view=diff ============================================================================== --- apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh (original) +++ apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh Sun Jul 25 19:48:03 2010 @@ -28,26 +28,34 @@ rm -rf aclocal.m4 libtool.m4 ltsugar.m4 $libtoolize --copy --automake # -# Build aclocal.m4 from libtool's libtool.m4 +# find libtool.m4 # -if [ -f libtool.m4 ]; then - ltfile=libtool.m4 -else +if [ ! -f libtool.m4 ]; then ltpath=`dirname $libtoolize` ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} + if [ -f $ltfile ]; then + echo "libtool.m4 found at $ltfile" + cp $ltfile libtool.m4 + else + echo "libtool.m4 not found - aborting!" + exit 1 + fi fi -echo "Incorporating $ltfile into aclocal.m4 ..." + +# +# Build aclocal.m4 from libtool's m4 files +# echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4 echo "dnl edits here will be lost" >> aclocal.m4 -cat $ltfile >> aclocal.m4 - -if [ -f ltsugar.m4 ]; then - echo "Incorporating ltsugar.m4 into aclocal.m4 ..." - cat ltsugar.m4 >> aclocal.m4 -fi -# Clean up again -rm -f libtool.m4 ltsugar.m4 +for m4file in libtool.m4 ltsugar.m4 ltoptions.m4 ltversion.m4 lt~obsolete.m4 +do + if [ -f $m4file ]; then + echo "Incorporating $m4file into aclocal.m4 ..." + cat $m4file >> aclocal.m4 + rm -f $m4file + fi +done cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling" Modified: apr/apr-util/branches/1.4.x/xml/expat/configure.in URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/configure.in?rev=979103&r1=979102&r2=979103&view=diff ============================================================================== --- apr/apr-util/branches/1.4.x/xml/expat/configure.in (original) +++ apr/apr-util/branches/1.4.x/xml/expat/configure.in Sun Jul 25 19:48:03 2010 @@ -12,6 +12,7 @@ dnl AC_INIT(Makefile.in) AC_CONFIG_AUX_DIR(conftools) +AC_CONFIG_MACRO_DIR(.) dnl dnl Follow the GNU/Linux convention of odd number minor version for