svn commit: r742743 - in /apr/apr/branches/1.4.x: ./ build/ buildconf configure.in

[ji...@apache.org]

Author: jim
Date: Mon Feb  9 21:21:45 2009
New Revision: 742743

URL: http://svn.apache.org/viewvc?rev=742743&view=rev
Log:
Merge r733052 from trunk:

Fix buildconf with libtool 2.2:

* buildconf: Use a different Extremely Ugly Hack to extract and copy
  the list of .m4 files needed directly from libtoolize.

* configure.in: Include more files which might be needed by libtool.

* build/: Ignore more.

Submitted by: jorton
Reviewed/backported by: jim

Modified:
    apr/apr/branches/1.4.x/   (props changed)
    apr/apr/branches/1.4.x/build/   (props changed)
    apr/apr/branches/1.4.x/buildconf
    apr/apr/branches/1.4.x/configure.in

Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /apr/apr/trunk:733052

Propchange: apr/apr/branches/1.4.x/build/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb  9 21:21:45 2009
@@ -1,6 +1,5 @@
 Makefile
 libtool.m4
-ltsugar.m4
 ltconfig
 ltmain.sh
 ltcf-c.sh
@@ -15,3 +14,5 @@
 *.plg
 *.dep
 *.mak
+lt*.m4
+argz.m4

Modified: apr/apr/branches/1.4.x/buildconf
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/buildconf?rev=742743&r1=742742&r2=742743&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/buildconf (original)
+++ apr/apr/branches/1.4.x/buildconf Mon Feb  9 21:21:45 2009
@@ -45,6 +45,14 @@
 
 if [ -f libtool.m4 ]; then 
    ltfile=`pwd`/libtool.m4
+elif grep all_pkgmacro_files $libtoolize > /dev/null; then
+    # libtool 2.x
+   aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
+   ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
+   for f in $ltfiles; do
+       test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build
+   done
+   ltfile=$aclocal_dir/libtool.m4
 else
    ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
                    < $libtoolize`"

Modified: apr/apr/branches/1.4.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/configure.in?rev=742743&r1=742742&r2=742743&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/configure.in (original)
+++ apr/apr/branches/1.4.x/configure.in Mon Feb  9 21:21:45 2009
@@ -20,6 +20,10 @@
 sinclude(build/apr_hints.m4)
 sinclude(build/libtool.m4)
 sinclude(build/ltsugar.m4)
+sinclude(build/argz.m4)
+sinclude(build/ltoptions.m4)
+sinclude(build/ltversion.m4)
+sinclude(build/lt~obsolete.m4)
 
 dnl Hard-coded inclusion at the tail end of apr_private.h:
 AH_BOTTOM([