1 files changed, 24 insertions, 15 deletions

diff --git a/www/apache21/files/patch-srclib:apr-util:xml:expat:buildconf.sh b/www/apache21/files/patch-srclib:apr-util:xml:expat:buildconf.sh
index c4922c1573b9..070c76fa8a7c 100644
--- a/www/apache21/files/patch-srclib:apr-util:xml:expat:buildconf.sh
+++ b/www/apache21/files/patch-srclib:apr-util:xml:expat:buildconf.sh
@@ -1,20 +1,29 @@
---- srclib/apr-util/xml/expat/buildconf.sh.orig	Wed Nov 17 02:12:20 2004
-+++ srclib/apr-util/xml/expat/buildconf.sh	Sat Dec 11 17:04:11 2004
-@@ -3,7 +3,7 @@
+--- srclib/apr/buildconf.orig	Tue Jun 14 14:11:15 2005
++++ srclib/apr/buildconf	Sun Oct 30 19:47:52 2005
+@@ -23,7 +23,7 @@
  #
- # Find libtoolize
- #
--libtoolize=`conftools/PrintPath glibtoolize libtoolize libtoolize15 libtoolize14`
-+libtoolize=${LIBTOOLIZE}
+ build/buildcheck.sh || exit 1
+ 
+-libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`
++libtoolize="${LIBTOOLIZE}"
  if [ "x$libtoolize" = "x" ]; then
      echo "libtoolize not found in path"
      exit 1
-@@ -33,7 +33,7 @@
-   ltfile=libtool.m4
- else
-   ltpath=`dirname $libtoolize`
--  ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-+  ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool${LIBTOOL_VERSION}.m4}
+@@ -52,7 +52,7 @@
+    # Expecting the code above to be very portable, but just in case...
+    if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
+      ltpath=`dirname $libtoolize`
+-     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
++     ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
+    fi
+ fi
+   
+@@ -61,7 +61,7 @@
+     exit 1
  fi
- echo "Incorporating $ltfile into aclocal.m4 ..."
- echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
+ 
+-echo "buildconf: Using libtool.m4 at ${ltfile}."
++echo "buildconf: Using libtool${LIBTOOL_VERSION}.m4 at ${ltfile}."
+ 
+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+