You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ws...@apache.org on 2002/09/25 04:58:20 UTC
cvs commit: apr-iconv buildconf.sh
wsanchez 2002/09/24 19:58:20
Modified: . buildconf.sh
Log:
Find libtoolize when called glibtoolize.
Borrow method from apr's buildconf.
Revision Changes Path
1.2 +7 -4 apr-iconv/buildconf.sh
Index: buildconf.sh
===================================================================
RCS file: /home/cvs/apr-iconv/buildconf.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildconf.sh 24 Mar 2001 04:15:44 -0000 1.1
+++ buildconf.sh 25 Sep 2002 02:58:20 -0000 1.2
@@ -3,9 +3,12 @@
#
# Build aclocal.m4 from libtool's libtool.m4 and our own M4 files.
#
-### we may need to get smarter with these two lines (e.g. PrintPath)
-ltpath=`../apr/build/PrintPath libtoolize`
-ltpath=`dirname $ltpath`
+libtoolize=`../apr/build/PrintPath glibtoolize libtoolize`
+if [ "x$libtoolize" = "x" ]; then
+ echo "libtoolize not found in path"
+ exit 1
+fi
+ltpath=`dirname $libtoolize`
ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
echo "Incorporating $ltfile into aclocal.m4 ..."
echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
@@ -19,7 +22,7 @@
# Note: we always replace the files, and we copy (rather than link) them.
#
echo "Copying libtool helper files ..."
-$ltpath/libtoolize --force --copy
+$libtoolize --force --copy
#
# Generate the autoconf header (include/apu_config.h) and ./configure