diff options
author | Joe Orton <jorton@apache.org> | 2009-01-09 14:51:43 +0000 |
---|---|---|
committer | Joe Orton <jorton@apache.org> | 2009-01-09 14:51:43 +0000 |
commit | 6ac5547486d13cdb4670ffb8f9b3cced22caa807 (patch) | |
tree | 8153611ecd89a4f2802b7d82256a8cad61e5309b /buildconf | |
parent | 083581b165999bde4c9aec63da89400c44a551c7 (diff) | |
download | apr-6ac5547486d13cdb4670ffb8f9b3cced22caa807.tar.gz |
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: https://svn.apache.org/repos/asf/apr/apr/trunk@733052 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'buildconf')
-rwxr-xr-x | buildconf | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -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`" |