diff options
author | Neil Mayhew <neil_mayhew@sil.org> | 2015-06-12 23:03:21 +0300 |
---|---|---|
committer | Eberhard Beilharz <eb1@sil.org> | 2016-01-30 16:54:52 +0300 |
commit | 3bc3da8f4d19e40664bc09b0a7f2249cd591875f (patch) | |
tree | 00b3bbb6c052323129a736a51ffef28800382bc4 /libgc | |
parent | a65739d19518a0987f79fbb7c5d569b43755390c (diff) |
Check for libtoolize rather than libtool
Current Debian packaging puts libtool in its own package (libtool-bin)
leaving only libtoolize in the main package. The mono build process
uses libtoolize not libtool, so during autogen check for libtoolize
not libtool.
Diffstat (limited to 'libgc')
-rwxr-xr-x | libgc/autogen.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libgc/autogen.sh b/libgc/autogen.sh index 10ae8cf6831..65e1f25f39c 100755 --- a/libgc/autogen.sh +++ b/libgc/autogen.sh @@ -15,18 +15,18 @@ test -z "$srcdir" && srcdir=. DIE=1 } -if [ -z "$LIBTOOL" ]; then - LIBTOOL=`which glibtool 2>/dev/null` - if [ ! -x "$LIBTOOL" ]; then - LIBTOOL=`which libtool` +if [ -z "$LIBTOOLIZE" ]; then + LIBTOOLIZE=`which glibtoolize 2>/dev/null` + if [ ! -x "$LIBTOOLIZE" ]; then + LIBTOOLIZE=`which libtoolize` fi fi (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && { - ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || { + ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { echo - echo "**Error**: You must have \`libtool' installed to compile Mono." - echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" + echo "**Error**: You must have \`libtoolize' installed to compile Mono." + echo "Get ftp://ftp.gnu.org/gnu/libtool/libtool-1.2.tar.gz" echo "(or a newer version if it is available)" DIE=1 } @@ -83,7 +83,7 @@ esac if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then if test -z "$NO_LIBTOOLIZE" ; then echo "Running libtoolize..." - ${LIBTOOL}ize --force --copy + $LIBTOOLIZE --force --copy fi fi |