MAC OS X ships with binaries named 'libtool' and 'libtoolize' which are

not the GNU tools. Those are prefixed with letter 'g'. --  Antoine Musso

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2086 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/MakeMakefile b/MakeMakefile
index 90e4700fd5a26dafd921693744fc9b06ebe4d00e..1b07f193b444adee58cc5931343a08d4e04179a8 100755 (executable)
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -20,8 +20,15 @@ ERROR=0
 LIBTOOL_VER="1.5.6"
 AUTOMAKE_VER="1.9.2"
 AUTOCONF_VER="2.59"
+LIBTOOL_BIN="libtool"
 
-if vcheck $LIBTOOL_VER "libtool --version"
+# On MAC OS X, GNU libtool is named 'glibtool':
+if [ `(uname -s) 2>/dev/null` == 'Darwin' ]
+then
+  LIBTOOL_BIN="glibtool"
+fi
+
+if vcheck $LIBTOOL_VER "$LIBTOOL_BIN --version"
 then
   echo "get a copy of GNU libtool >= $LIBTOOL_VER"
   ERROR=1

diff --git a/autogen.sh b/autogen.sh
index a7226cc2fc266f9b2af825b1e84988e4ef97f45d..45a11a40e110032a57ae5661e44a3e09edbb11d8 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,11 @@
 #!/bin/sh
-libtoolize
+
+# On MAC OS X, GNU libtoolize is named 'glibtoolize':
+if [ `(uname -s) 2>/dev/null` == 'Darwin' ]
+then
+       glibtoolize
+else
+       libtoolize
+fi
+
 autoreconf --force --install --verbose -I m4