Backport r733052 from the 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.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@747266 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 14 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index 94a15f81d..f2130fd53 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.3.4
 
+  *) Fix buildconf with libtool 2.2. [Joe Orton]
+
   *) Fix a bug with the APR_DELONCLOSE flag. Child processes were (also)
      unlinking the file. [Greg Stein]
 
diff --git a/buildconf b/buildconf
index bc0e9fdba..710d5a79b 100755
--- a/buildconf
+++ b/buildconf
@@ -45,6 +45,14 @@ $libtoolize --copy --automake
 
 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`"
diff --git a/configure.in b/configure.in
index 14f55ea3c..e53d9c58d 100644
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,10 @@ sinclude(build/apr_win32.m4)
 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([