diff --git a/program/MakeMakefile b/program/MakeMakefile
index 90e4700fd5a26dafd921693744fc9b06ebe4d00e..4ef2a62eed4839c77eb11abe1647e8658d5c5611 100755 (executable)
--- a/program/MakeMakefile
+++ b/program/MakeMakefile
-#!/bin/sh
+#!/bin/bash
#
# Run this script after the first cvs checkout to build
# makefiles and friends
-PATH="/usr/pack/automake-1.11-to/amd64-linux-debian3.1/:/usr/pack/automake-1.11-to/amd64-linux-ubuntu8.04/bin:$PATH"
+PATH="/usr/pack/automake-1.11-to/amd64-linux-debian3.1/:/usr/pack/automake-1.11-to/amd64-linux-ubuntu8.04/bin:/usr/pack/gettext-0.18.1.1-to/amd64-linux-ubuntu8.04/bin:$PATH"
export PATH
vcheck (){
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