[Expat-checkins] expat buildconf.sh,1.9,1.10
Greg Stein
gstein at users.sourceforge.net
Tue Jun 17 19:11:48 EDT 2003
Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1:/tmp/cvs-serv22950
Modified Files:
buildconf.sh
Log Message:
Patch submitted by Joe Orton <joe at 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.
Index: buildconf.sh
===================================================================
RCS file: /cvsroot/expat/expat/buildconf.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- buildconf.sh 1 Jun 2002 22:55:22 -0000 1.9
+++ buildconf.sh 18 Jun 2003 01:11:45 -0000 1.10
@@ -66,9 +66,17 @@
#
$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}."
#--------------------------------------------------------------------------
More information about the Expat-checkins
mailing list