Allow libtoolize or glibtoolize

Allowing glibtoolize helps compilation on OS X.
This commit is contained in:
Adam Vandenberg
2012-06-27 09:42:59 -07:00
parent 0347ef0a16
commit a6aa56b129

View File

@@ -18,14 +18,20 @@ DIE=0
DIE=1 DIE=1
} }
(grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null && {
(libtool --version) < /dev/null > /dev/null 2>&1 || { if which libtoolize && (libtooloze --version) < /dev/null > /dev/null 2>&1; then
echo LIBTOOLIZE=libtoolize
echo "**Error**: You must have \`libtool' installed." else
echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" if which glibtoolize && (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
echo "(or a newer version if it is available)" LIBTOOLIZE=glibtoolize
DIE=1 else
} echo
echo "**Error**: You must have \`libtool' installed."
echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
fi
fi
} }
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
@@ -129,7 +135,7 @@ do
aclocal $aclocalinclude aclocal $aclocalinclude
if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
echo "Running libtoolize..." echo "Running libtoolize..."
libtoolize --force --copy ${LIBTOOLIZE} --force --copy
fi fi
if grep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null; then if grep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..." echo "Running autoheader..."