X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=MakeMakefile;h=8b311faa59cfb511e4fb154de4e6c667a9132b73;hb=bf7d0302ab2ff46038f7002a9eab76f4105c3cee;hp=2047f1dc3b8f174e443077b3cdf005a7eb06e46e;hpb=d0b7939060ab8b257c528b0440690b159da3603a;p=rrdtool.git

diff --git a/MakeMakefile b/MakeMakefile
index 2047f1d..8b311fa 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,15 +20,15 @@ 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
 
@@ -43,9 +44,12 @@ libtoolize --copy --force
 cp ltmain.sh config
 
 # wget ftp://sources.redhat.com/pub/automake/automake-1.5.tar.gz
-aclocal
+# 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 -I $HOME/libtool/share/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