X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=MakeMakefile;h=90e4700fd5a26dafd921693744fc9b06ebe4d00e;hp=6e2250a610f5cef459d19a67f3954c402b4fad58;hb=732528deae5d3d282ef07e2fbb9372f2270c3668;hpb=ec028ffc51de6a4d33427ea505e2839b0516fd7d

diff --git a/MakeMakefile b/MakeMakefile
index 6e2250a..90e4700 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -3,80 +3,55 @@
 # 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"
+export PATH
+
 vcheck (){
   perl <<PERL
 @t = split /\./, "$1";
 @v = map { int \$_ } split /\./, (split /\s+/, \`$2\`)[3];
-print "$2 = ", (join ".",@v), "  (expected $1)\n";
+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"
 
-if vcheck 1.5 "libtool --version"
+if vcheck $LIBTOOL_VER "libtool --version"
 then
-  echo "get a copy of GNU libtool >= 1.5"
-  exit 1
+  echo "get a copy of GNU libtool >= $LIBTOOL_VER"
+  ERROR=1
 fi
 
-#if vcheck 1.8.2  "automake  --version"
-#then
-#  if vcheck 1.8.2  "automake-1.8 --version"
-#  then
-#    echo "get a copy of GNU automake >= 1.8.2"
-#    exit 1
-#  else
-#    automake=automake-1.8
-#    aclocal="aclocal-1.8  --acdir=/usr/share/aclocal-1.8 -I /usr/share/aclocal/"
-#  fi
-#else
-#    automake="automake"
-#    aclocal="aclocal  -I /usr/pack/libtool-1.5-to/share/aclocal"
-#fi
-
-if vcheck 1.7.9  "automake  --version"
+if vcheck $AUTOMAKE_VER  "automake  --version"
 then
-  if vcheck 1.7.9  "automake-1.7 --version"
+  if vcheck $AUTOMAKE_VER  "automake-1.11 --version"
   then
-    echo "get a copy of GNU automake >= 1.79"
-    exit 1
+    echo "get a copy of GNU automake >= $AUTOMAKE_VER"
+    ERROR=1
   else
-    automake=automake-1.7
-    aclocal="aclocal-1.7  --acdir=/usr/share/aclocal-1.7 -I /usr/share/aclocal/"
+    AUTOMAKE="automake-1.11"
+    ACLOCAL="aclocal-1.11"
+    export AUTOMAKE ACLOCAL
   fi
-else
-    automake="automake"
-    aclocal="aclocal -I /usr/pack/libtool-1.5-to/share/aclocal"
 fi
 
-if vcheck 2.58 "autoconf --version"
+
+if vcheck $AUTOCONF_VER "autoconf --version"
 then
-  echo "get a copy of GNU autoconf >= 2.54"
-  exit 1
+  echo "get a copy of GNU autoconf >= $autoconf_ver"
+  ERROR=1
 fi
 
-set -x
-find . -name Makefile | xargs rm -f
-find . -name "*.la" | xargs rm -f
-find . -name Makefile.in | xargs rm -f
-find . -name .libs | xargs rm -r
-find . -name .debs | xargs rm -r
-
-
-# wget ftp://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz
-libtoolize --copy --force
-#cp ltmain.sh config
-
-# wget ftp://sources.redhat.com/pub/automake/automake-1.7.9.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
-$automake --foreign --add-missing --force-missing --copy --warnings=all
-# wget ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.58.tar.gz
-autoconf --warnings=all --force
-rm config.h.in
-autoheader --warnings=all --force  
+if [ $ERROR -ne 0 ]
+then
+  exit 1
+fi
 
+./autogen.sh
 
+# vim: set syntax=sh :