--- srclib/apr-util/xml/expat/buildconf.sh.orig	Sat Mar 25 21:41:35 2006
+++ srclib/apr-util/xml/expat/buildconf.sh	Mon May  1 12:11:04 2006
@@ -3,7 +3,7 @@
 #
 # Build aclocal.m4 from libtool's libtool.m4
 #
-libtoolize=`conftools/PrintPath glibtoolize libtoolize`
+libtoolize=${LIBTOOLIZE}
 if [ "x$libtoolize" = "x" ]; then
     echo "libtoolize not found in path"
     exit 1
@@ -16,7 +16,7 @@
 rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
 
 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}
 echo "Incorporating $ltfile into aclocal.m4 ..."
 echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
 echo "dnl edits here will be lost" >> aclocal.m4