X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=MakeMakefile;h=4aba88c6fcd3d98a9290ec1c17bb0f819aba2f9e;hp=e2cb9fa463f1fedf853f7ba69c2d3ce9cb7b8744;hb=c2588300e3b61df51b846dd79d90b3da9628d0cb;hpb=2ffb7192e9ec59cd2d3ac13823de8cbc779f6e9d

diff --git a/MakeMakefile b/MakeMakefile
index e2cb9fa..4aba88c 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -6,47 +6,61 @@
 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
 }
 
+ERROR=0
 
-if vcheck 1.4.2 "libtool --version"
+if vcheck 1.5.14 "libtool --version"
 then
-  echo get a copy of GNU libtool >= 1.4.2
-  exit 1
+  echo "get a copy of GNU libtool >= 1.5.14"
+  ERROR=1
 fi
 
-if vcheck 1.5  "automake --version"
+if vcheck 1.9.5  "automake  --version"
 then
-  echo get a copy of GNU automake >= 1.5
-  exit 1
+  if vcheck 1.9.5  "automake-1.9 --version"
+  then
+    echo "get a copy of GNU automake >= 1.9.5"
+    ERROR=1
+  else
+    automake=automake-1.9
+    aclocal="aclocal-1.9  --acdir=/usr/share/aclocal-1.9 -I /usr/share/aclocal/"
+  fi
+else
+    automake="automake"
+    aclocal="aclocal"
+#    aclocal="aclocal -I /usr/pack/libtool-1.5.14-to/share/aclocal"
+fi
+
+if vcheck 2.59 "autoconf --version"
+then
+  echo "get a copy of GNU autoconf >= 2.59"
+  ERROR=1
 fi
 
-if vcheck 2.52 "autoconf --version"
+if [ $ERROR -ne 0 ]
 then
-  echo get a copy of GNU autoconf >= 2.52
   exit 1
 fi
 
+# cleanup
 set -x
-find . -name Makefile | 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 
+find . -name Makefile | xargs rm -f _UNKNONW_
+find . -name "*.la" | xargs rm -f
+find . -name Makefile.in | xargs rm -f _UNKNONW_
+find . -name .libs | xargs rm -r 
+find . -name .debs | xargs rm -r
 
-# wget ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.gz
-autoconf 
+libtoolize --copy --force
+$aclocal
+$automake --foreign --add-missing --force-missing --copy --warnings=all
+autoconf --warnings=all --force
+rm config.h.in
+autoheader --warnings=all --force