Author: jfrederic.clere(a)jboss.com Date: 2009-07-10 10:59:15 -0400 (Fri, 10 Jul 2009) New Revision: 2487 Modified: trunk/build/patch/httpd-2.2.11.patch Log: apr-util needs quite a lot... Modified: trunk/build/patch/httpd-2.2.11.patch =================================================================== --- trunk/build/patch/httpd-2.2.11.patch 2009-07-10 13:27:54 UTC (rev 2486) +++ trunk/build/patch/httpd-2.2.11.patch 2009-07-10 14:59:15 UTC (rev 2487) @@ -30,15 +30,69 @@ dnl Hard-coded inclusion at the tail end of apr_private.h: AH_BOTTOM([ - ---- srclib/apr-util/xml/expat/configure.in (revision 792909) +--- srclib/apr-util/configure.in (revision 792943) ++++ srclib/apr-util/configure.in (working copy) +@@ -8,6 +8,10 @@ + AC_CONFIG_HEADER(include/private/apu_config.h) + AC_CONFIG_AUX_DIR(build) + ++sinclude(build/ltsugar.m4) ++sinclude(build/ltversion.m4) ++sinclude(build/lt~obselete.m4) ++sinclude(build/ltoptions) + sinclude(build/apu-conf.m4) + sinclude(build/apu-iconv.m4) + sinclude(build/apu-hints.m4) +@@ -17,6 +21,8 @@ + sinclude(build/dbd.m4) + sinclude(build/dso.m4) + ++ ++ + dnl Generate ./config.nice for reproducing runs of configure + dnl + APR_CONFIG_NICE(config.nice) +--- srclib/apr-util/xml/expat/configure.in (revision 792943) +++ srclib/apr-util/xml/expat/configure.in (working copy) -@@ -53,8 +53,7 @@ - LIBTOOL="$srcdir/../../../apr/build/aplibtool" +@@ -46,6 +46,15 @@ + AC_CONFIG_HEADER(config.h) + + AC_CANONICAL_SYSTEM ++ ++sinclude(ltoptions) ++sinclude(libtool.m4) ++sinclude(ltsugar.m4) ++sinclude(argz.m4) ++sinclude(ltoptions.m4) ++sinclude(ltversion.m4) ++sinclude(lt~obsolete.m4) ++ + case "$host_os" in + *os2*) + # Use a custom made libtool replacement +@@ -54,7 +63,7 @@ ;; *) -- AC_LIBTOOL_WIN32_DLL + AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL + AC_PROG_LIBTOOL ;; esac + +--- srclib/apr-util/xml/expat/buildconf.sh (revision 792943) ++++ srclib/apr-util/xml/expat/buildconf.sh (working copy) +@@ -32,6 +32,14 @@ + # + if [ -f libtool.m4 ]; then + ltfile=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" . ++ done ++ ltfile=$aclocal_dir/libtool.m4 + else + ltpath=`dirname $libtoolize` + ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}