From aaccee69b841016229effb4134f60bb288b9efd8 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 15 Mar 2013 00:04:58 +0100 Subject: [PATCH] Fix autogen.sh on Mac OS X. --- autogen.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index 17b17bdc2..32cea422d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -72,8 +72,16 @@ fi } } +LIBTOOL=libtool +LIBTOOLIZE=libtoolize + +if glibtool --version < /dev/null > /dev/null 2>&1; then + LIBTOOL=glibtool + LIBTOOLIZE=glibtoolize +fi + (grep "^LT_INIT" $srcdir/configure.ac >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { + ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`libtool' installed." echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" @@ -133,9 +141,9 @@ esac # verify that libtool-ltdl-devel is installed echo "Running libtoolize dry-run..." -if ! libtoolize --quiet --copy --force ; then +if ! $LIBTOOLIZE --quiet --copy --force ; then echo "" - echo "**Error**: libtoolize cannot detect necessary files." + echo "**Error**: $LIBTOOLIZE cannot detect necessary files." echo "" echo "Make sure libtool-ltdl-devel (RHEL) / libltdl-dev (Debian) or an" echo "appropriate package for your distribution is installed." @@ -171,8 +179,8 @@ do fi if grep "^LT_INIT" configure.ac >/dev/null; then if test -z "$NO_LIBTOOLIZE" ; then - echo "Running libtoolize..." - libtoolize --force --copy + echo "Running $LIBTOOLIZE..." + $LIBTOOLIZE --force --copy find third-party/ltdl \! -perm u=w -exec chmod u+w '{}' ';' fi fi -- 2.40.0