diff -Nru httpd-2.0.49-rc1.orig/srclib/apr/build/buildcheck.sh httpd-2.0.49-rc1/srclib/apr/build/buildcheck.sh
--- httpd-2.0.49-rc1.orig/srclib/apr/build/buildcheck.sh	Sun Jan 25 16:41:56 2004
+++ httpd-2.0.49-rc1/srclib/apr/build/buildcheck.sh	Tue Mar  9 07:49:42 2004
@@ -26,7 +26,7 @@
 # output is multiline from 1.5 onwards
 
 # Require libtool 1.3.3 or newer
-libtool=`build/PrintPath glibtool libtool`
+libtool=${LIBTOOL}
 lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
 if test -z "$lt_pversion"; then
 echo "buildconf: libtool not found."
diff -Nru httpd-2.0.49-rc1.orig/srclib/apr/buildconf httpd-2.0.49-rc1/srclib/apr/buildconf
--- httpd-2.0.49-rc1.orig/srclib/apr/buildconf	Tue Jun 17 20:44:25 2003
+++ httpd-2.0.49-rc1/srclib/apr/buildconf	Tue Mar  9 07:53:27 2004
@@ -60,7 +60,7 @@
 #
 build/buildcheck.sh || exit 1
 
-libtoolize=`build/PrintPath glibtoolize libtoolize`
+libtoolize=${LIBTOOLIZE}
 if [ "x$libtoolize" = "x" ]; then
     echo "libtoolize not found in path"
     exit 1
@@ -81,14 +81,14 @@
 $libtoolize --copy --automake
 
 ltpath=`dirname $libtoolize`
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
 
 if [ ! -f $ltfile ]; then
     echo "$ltfile not found"
     exit 1
 fi
 
-echo "buildconf: Using libtool.m4 at ${ltfile}."
+echo "buildconf: Using ${LIBTOOL_VERSION}.m4 at ${ltfile}."
 
 cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
 
diff -Nru httpd-2.0.49-rc1.orig/srclib/apr-util/xml/expat/buildconf.sh httpd-2.0.49-rc1/srclib/apr-util/xml/expat/buildconf.sh
--- httpd-2.0.49-rc1.orig/srclib/apr-util/xml/expat/buildconf.sh	Tue Jun 17 20:51:47 2003
+++ httpd-2.0.49-rc1/srclib/apr-util/xml/expat/buildconf.sh	Tue Mar  9 07:52:57 2004
@@ -3,13 +3,13 @@
 #
 # 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
 fi
 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