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


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

1 files changed, 8 insertions, 0 deletions

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`"