Author: jfrederic.clere(a)jboss.com Date: 2009-07-10 05:20:11 -0400 (Fri, 10 Jul 2009) New Revision: 2482 Added: trunk/build/patch/httpd-2.2.11.patch Log: Add support for libtool 2.2.x Added: trunk/build/patch/httpd-2.2.11.patch =================================================================== --- trunk/build/patch/httpd-2.2.11.patch (rev 0) +++ trunk/build/patch/httpd-2.2.11.patch 2009-07-10 09:20:11 UTC (rev 2482) @@ -0,0 +1,34 @@ +--- srclib/apr/buildconf (original) ++++ srclib/apr/buildconf Tue Feb 24 03:24:54 2009 +@@ -45,6 +45,14 @@ + + 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`" + +--- srclib/apr/configure.in (original) ++++ srclib/apr/configure.in Tue Feb 24 03:24:54 2009 +@@ -20,6 +20,10 @@ + 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([ + + +