projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added g as valid string format value
[rrdtool.git]
/
MakeMakefile
diff --git
a/MakeMakefile
b/MakeMakefile
index
d8032d0
..
28c62ed
100755
(executable)
--- a/
MakeMakefile
+++ b/
MakeMakefile
@@
-6,9
+6,10
@@
vcheck (){
perl <<PERL
@t = split /\./, "$1";
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";
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
}
PERL
}
@@
-19,15
+20,15
@@
then
exit 1
fi
exit 1
fi
-if vcheck 1.
5 "automake
--version"
+if vcheck 1.
7 "automake-1.7
--version"
then
then
- echo "get a copy of GNU automake >= 1.
5
"
+ echo "get a copy of GNU automake >= 1.
7
"
exit 1
fi
exit 1
fi
-if vcheck 2.5
2
"autoconf --version"
+if vcheck 2.5
4
"autoconf --version"
then
then
- echo "get a copy of GNU autoconf >= 2.5
2
"
+ echo "get a copy of GNU autoconf >= 2.5
4
"
exit 1
fi
exit 1
fi
@@
-48,7
+49,7
@@
cp ltmain.sh config
# directory location of this file.
aclocal
autoheader --warnings=all
# 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
# wget ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.gz
autoconf