diff options
-rwxr-xr-x | buildconf | 8 | ||||
-rw-r--r-- | configure.in | 4 |
2 files changed, 12 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`" 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([ |