X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=MakeMakefile;h=90e4700fd5a26dafd921693744fc9b06ebe4d00e;hp=dbbd0f4257480cd4b564fce2536a2b51ef3f1f19;hb=8d6912995d9641a27ef051ad4234883c89464ca0;hpb=469e86d9ca9044c300872eb3353ca5c24fe41205

diff --git a/MakeMakefile b/MakeMakefile
index dbbd0f4..90e4700 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -3,43 +3,47 @@
 # 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.14 "libtool --version"
+if vcheck $LIBTOOL_VER "libtool --version"
 then
-  echo "get a copy of GNU libtool >= 1.5.14"
+  echo "get a copy of GNU libtool >= $LIBTOOL_VER"
   ERROR=1
 fi
 
-if vcheck 1.9.5  "automake  --version"
+if vcheck $AUTOMAKE_VER  "automake  --version"
 then
-  if vcheck 1.9.5  "automake-1.9 --version"
+  if vcheck $AUTOMAKE_VER  "automake-1.11 --version"
   then
-    echo "get a copy of GNU automake >= 1.9.5"
+    echo "get a copy of GNU automake >= $AUTOMAKE_VER"
     ERROR=1
   else
-    automake=automake-1.9
-    aclocal="aclocal-1.9  --acdir=/usr/share/aclocal-1.9 -I /usr/share/aclocal/"
+    AUTOMAKE="automake-1.11"
+    ACLOCAL="aclocal-1.11"
+    export AUTOMAKE ACLOCAL
   fi
-else
-    automake="automake"
-    aclocal="aclocal"
-#    aclocal="aclocal -I /usr/pack/libtool-1.5.14-to/share/aclocal"
 fi
 
-if vcheck 2.59 "autoconf --version"
+
+if vcheck $AUTOCONF_VER "autoconf --version"
 then
-  echo "get a copy of GNU autoconf >= 2.59"
+  echo "get a copy of GNU autoconf >= $autoconf_ver"
   ERROR=1
 fi
 
@@ -48,19 +52,6 @@ then
   exit 1
 fi
 
-# cleanup
-set -x
-find . -name Makefile | xargs rm -f _UNKNONW_
-find . -name "*.la" | xargs rm -f
-find . -name Makefile.in | xargs rm -f _UNKNONW_
-find . -name .libs | xargs rm -r 
-find . -name .debs | xargs rm -r
+./autogen.sh
 
-$aclocal
-libtoolize --copy --force
-autoheader --warnings=all --force  
-$aclocal
-$automake --foreign --add-missing --force-missing --copy --warnings=all
-autoconf --warnings=all --force
-rm config.h.in
-autoheader --warnings=all --force  
+# vim: set syntax=sh :