diff options
| author | Malcolm Tredinnick <malcolm@src.gnome.org> | 2003-05-03 11:02:31 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm@src.gnome.org> | 2003-05-03 11:02:31 +0000 |
| commit | bd7e150fbf9603c20502dfb41234b03266ea376c (patch) | |
| tree | 1cc8f0ac19285487569aa8acf846401c3c2ff0a2 | |
| parent | f2b3e6099e7ce2ba83b7f7a91b7650d03e4213d4 (diff) | |
| download | gnome-common-bd7e150fbf9603c20502dfb41234b03266ea376c.tar.gz | |
Allow users to specify the binary to run instead of libtoolize by checking
* autogen.sh: Allow users to specify the binary to run instead of
libtoolize by checking the value of $LIBTOOLIZE. This is apparently an
issue sometimes on MacOS X and fixes bug #111917.
svn path=/trunk/; revision=2834
| -rw-r--r-- | macros/ChangeLog | 6 | ||||
| -rw-r--r-- | macros/autogen.sh | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index be94cbb..72c1287 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,9 @@ +2003-05-03 Malcolm Tredinnick <malcolm@commsecure.com.au> + + * autogen.sh: Allow users to specify the binary to run instead of + libtoolize by checking the value of $LIBTOOLIZE. This is apparently an + issue sometimes on MacOS X and fixes bug #111917. + 2003-03-20 Frederic Crozat <fcrozat@mandrakesoft.com> * autogen.sh: use GNOME2_DIR, not GNOME2_PATH which can be diff --git a/macros/autogen.sh b/macros/autogen.sh index 6c45455..199521f 100644 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -37,8 +37,11 @@ fi } } +# Set this variable is libttoolize is called something else (like glibtoolize +# on some MacOS X systems). Leave it unset otherwise. +: ${LIBTOOLIZE=libtoolize} (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/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 $PKG_NAME." echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" @@ -169,7 +172,7 @@ do if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then if test -z "$NO_LIBTOOLIZE" ; then echo "Running libtoolize..." - libtoolize --force --copy + $LIBTOOLIZE --force --copy fi fi echo "Running aclocal-1.4 $aclocalinclude ..." |