projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow to force overwrite when restoring from xml to rrd.
[rrdtool.git]
/
MakeMakefile
diff --git
a/MakeMakefile
b/MakeMakefile
index
e2cb9fa
..
28c62ed
100755
(executable)
--- a/
MakeMakefile
+++ b/
MakeMakefile
@@
-6,45
+6,50
@@
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
}
if vcheck 1.4.2 "libtool --version"
then
PERL
}
if vcheck 1.4.2 "libtool --version"
then
- echo
get a copy of GNU libtool >= 1.4.2
+ echo
"get a copy of GNU libtool >= 1.4.2"
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.52
+ echo
"get a copy of GNU autoconf >= 2.54"
exit 1
fi
set -x
find . -name Makefile | xargs rm -f
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
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
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
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