diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:33 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:33 +0100 |
| commit | ad14e19ad0400e289b06fb7728aea815e6ed49be (patch) | |
| tree | bd29489cafb04b303940169ae7b00c1171a5a34c /srclib/apr/buildconf | |
| parent | 02a0e3b89d2ea1b984365e692c910668d75c6dcd (diff) | |
| download | apache2-upstream/2.2.12.tar.gz | |
Upstream tarball 2.2.12upstream/2.2.12
Diffstat (limited to 'srclib/apr/buildconf')
| -rwxr-xr-x | srclib/apr/buildconf | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/srclib/apr/buildconf b/srclib/apr/buildconf index bc0e9fdb..15747f9e 100755 --- a/srclib/apr/buildconf +++ b/srclib/apr/buildconf @@ -23,7 +23,7 @@ # build/buildcheck.sh || exit 1 -libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize` +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize` if [ "x$libtoolize" = "x" ]; then echo "libtoolize not found in path" exit 1 @@ -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`" |