Patch submitted by Joe Orton <joe@manyfish.co.uk> with additional

modifications by Greg Stein (comments and text changes).

* buildconf.sh: to deal with crazy/custom libtool installations, allow
    the developer/package to specify the libtool.m4 location by
    setting the LIBTOOL_M4 environment variable. If that isn't set,
    then we use our previous method of trying to derive its location.

diff --git a/expat/buildconf.sh b/expat/buildconf.sh
index 4f67ca79c7e776e2398ca31649b1d9e8903aee57..2fc5932a3a86fb9e4198f73e70cc04b758d3fa22 100755 (executable)
--- a/expat/buildconf.sh
+++ b/expat/buildconf.sh
@@ -66,10 +66,18 @@ echo "Copying libtool helper files ..."
 #
 $libtoolize --copy --automake
 
+#
+# Find the libtool.m4 file. The developer/packager can set the LIBTOOL_M4
+# environment variable to specify its location. If that variable is not
+# set, then we'll assume a "standard" libtool installation and try to
+# derive its location.
+#
 ltpath=`dirname $libtoolize`
-ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
 cp $ltfile conftools/libtool.m4
 
+echo "Using libtool.m4 from ${ltfile}."
+
 #--------------------------------------------------------------------------
 
 ### for a little while... remove stray aclocal.m4 files from