From: Tobias Oetiker <tobi@oetiker.ch>
Date: Sun, 3 Nov 2002 15:07:13 +0000 (+0000)
Subject: fixed
X-Git-Tag: 1.2rc1~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b26349068de34cec4dc5023c8587b7efe40e281d;p=thirdparty%2Frrdtool-1.x.git

fixed


git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@166 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/MakeMakefile b/MakeMakefile
index 2d2e21fe..28c62ed9 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,7 +20,7 @@ then
   exit 1
 fi
 
-if vcheck 1.7  "automake --version"
+if vcheck 1.7  "automake-1.7 --version"
 then
   echo "get a copy of GNU automake >= 1.7"
   exit 1
@@ -48,7 +49,7 @@ cp ltmain.sh config
 # 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