fix off by 1 error

[rrdtool.git] / MakeMakefile

diff --git a/MakeMakefile b/MakeMakefile
index d8032d0..4ef2a62 100755 (executable)
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -1,56 +1,64 @@
-#!/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:/usr/pack/gettext-0.18.1.1-to/amd64-linux-ubuntu8.04/bin:$PATH"
+export PATH
+
 vcheck (){
   perl <<PERL
 @t = split /\./, "$1";
-@v = split /\./, (split /\s+/, \`$2\`)[3];
-print "$2 = ", (join ".",@v), "  (expected $1)\n";
-exit \$t[0]*1000000+\$t[1]*1000+\$t[2] > \$v[0]*1000000+\$v[1]*1000+\$v[2];
+@v = map { int \$_ } split /\./, (split /\s+/, \`$2\`)[3];
+print "$2 = ", (join ".",@v), "  (expecting $1 or later)\n";
+\$v = \$t[0]*1000000+\$t[1]*1000+\$t[2] <= \$v[0]*1000000+\$v[1]*1000+\$v[2];
+exit \$v
 PERL
 }
 
+ERROR=0
+LIBTOOL_VER="1.5.6"
+AUTOMAKE_VER="1.9.2"
+AUTOCONF_VER="2.59"
+LIBTOOL_BIN="libtool"
 
-if vcheck 1.4.2 "libtool --version"
+# On MAC OS X, GNU libtool is named 'glibtool':
+if [ `(uname -s) 2>/dev/null` == 'Darwin' ]
 then
-  echo "get a copy of GNU libtool >= 1.4.2"
-  exit 1
+  LIBTOOL_BIN="glibtool"
 fi
 
-if vcheck 1.5  "automake --version"
+if vcheck $LIBTOOL_VER "$LIBTOOL_BIN --version"
 then
-  echo "get a copy of GNU automake >= 1.5"
-  exit 1
+  echo "get a copy of GNU libtool >= $LIBTOOL_VER"
+  ERROR=1
 fi
 
-if vcheck 2.52 "autoconf --version"
+if vcheck $AUTOMAKE_VER  "automake  --version"
 then
-  echo "get a copy of GNU autoconf >= 2.52"
-  exit 1
+  if vcheck $AUTOMAKE_VER  "automake-1.11 --version"
+  then
+    echo "get a copy of GNU automake >= $AUTOMAKE_VER"
+    ERROR=1
+  else
+    AUTOMAKE="automake-1.11"
+    ACLOCAL="aclocal-1.11"
+    export AUTOMAKE ACLOCAL
+  fi
 fi
 
-set -x
-find . -name Makefile | xargs rm -f
-find . -name "*.la" | xargs rm -f
-find . -name Makefile.in | xargs rm -f
-
-
 
-# wget ftp://ftp.gnu.org/gnu/libtool/libtool-1.4.2.tar.gz
-libtoolize --copy --force
-cp ltmain.sh config
-
-# wget ftp://sources.redhat.com/pub/automake/automake-1.5.tar.gz
-# If autoconf generates undefined MACRO errors, it may be unable
-# to find libtool.m4. Add the -I flag to aclocal to specify the
-# directory location of this file.
-aclocal
-autoheader --warnings=all
-automake --foreign --add-missing --force-missing --copy 
+if vcheck $AUTOCONF_VER "autoconf --version"
+then
+  echo "get a copy of GNU autoconf >= $autoconf_ver"
+  ERROR=1
+fi
 
-# wget ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.gz
-autoconf 
+if [ $ERROR -ne 0 ]
+then
+  exit 1
+fi
 
+./autogen.sh
 
+# vim: set syntax=sh :