X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=MakeMakefile;h=28c62ed9b30f83e28411294d156bffa7b70b272d;hb=e6d6ed89bc84009c5ea94d5e2c770833afb80f21;hp=75dd4e0ee0323203c7ba68ef709e87670e40f32e;hpb=86b06a94d27d0813e5d9cd211eb406966b7a0cbd;p=rrdtool.git

diff --git a/MakeMakefile b/MakeMakefile
index 75dd4e0..28c62ed 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -6,9 +6,10 @@
 vcheck (){
   perl <<PERL
 @t = split /\./, "$1";
-@v = split /\./, (split /\s+/, \`$2\`)[3];
+@v = map { int \$_ } 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 = \$t[0]*1000000+\$t[1]*1000+\$t[2] <= \$v[0]*1000000+\$v[1]*1000+\$v[2];
+exit \$v
 PERL
 }
 
@@ -19,32 +20,36 @@ then
   exit 1
 fi
 
-if vcheck 1.5  "automake --version"
+if vcheck 1.7  "automake-1.7 --version"
 then
-  echo "get a copy of GNU automake >= 1.5"
+  echo "get a copy of GNU automake >= 1.7"
   exit 1
 fi
 
-if vcheck 2.52 "autoconf --version"
+if vcheck 2.54 "autoconf --version"
 then
-  echo "get a copy of GNU autoconf >= 2.52"
+  echo "get a copy of GNU autoconf >= 2.54"
   exit 1
 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
+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 
+automake-1.7 --foreign --add-missing --force-missing --copy 
 
 # wget ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.gz
 autoconf