projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
in remote mode, make argument count for remote commmands strict as suggested by Dave...
[rrdtool.git]
/
MakeMakefile
diff --git
a/MakeMakefile
b/MakeMakefile
index
bfcfddf
..
4ef2a62
100755
(executable)
--- a/
MakeMakefile
+++ b/
MakeMakefile
@@
-1,9
+1,9
@@
-#!/bin/sh
+#!/bin/
ba
sh
#
# Run this script after the first cvs checkout to build
# makefiles and friends
#
# Run this script after the first cvs checkout to build
# makefiles and friends
-PATH="/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 (){
export PATH
vcheck (){
@@
-17,11
+17,18
@@
PERL
}
ERROR=0
}
ERROR=0
-LIBTOOL_VER="2.2.6"
-AUTOMAKE_VER="1.11"
-AUTOCONF_VER="2.63"
+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
then
echo "get a copy of GNU libtool >= $LIBTOOL_VER"
ERROR=1