misc fixes to get rrdtool working without included libraries.

[rrdtool.git] / MakeMakefile

diff --git a/MakeMakefile b/MakeMakefile
index 75dd4e0..59d098f 100755 (executable)
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -6,47 +6,55 @@
 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
 }
 
 
-if vcheck 1.4.2 "libtool --version"
+if vcheck 1.5 "libtool --version"
 then
-  echo "get a copy of GNU libtool >= 1.4.2"
+  echo "get a copy of GNU libtool >= 1.5"
   exit 1
 fi
 
-if vcheck 1.5  "automake --version"
+if vcheck 1.7.9  "automake --version"
 then
-  echo "get a copy of GNU automake >= 1.5"
+  echo "get a copy of GNU automake >= 1.7.9"
   exit 1
 fi
 
-if vcheck 2.52 "autoconf --version"
+if vcheck 2.58 "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
-cp ltmain.sh config
-
-# wget ftp://sources.redhat.com/pub/automake/automake-1.5.tar.gz
-aclocal
-autoheader --warnings=all
-automake --foreign --add-missing --force-missing --copy 
-
-# wget ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.gz
-autoconf 
+find . -name .libs | xargs rm -r
+find . -name .debs | xargs rm -r
+
+
+rm -rf config
+mkdir config
+# wget ftp://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz
+libtoolize --copy --force
+#cp ltmain.sh config
+
+# wget ftp://sources.redhat.com/pub/automake/automake-1.7.9.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 -I /usr/pack/libtool-1.5-to/share/aclocal
+automake --foreign --add-missing --force-missing --copy --warnings=all
+# wget ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.58.tar.gz
+autoconf --warnings=all --force
+rm config.h.in
+autoheader --warnings=all --force