X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=MakeMakefile;h=6397703e9f7660dd5194118247cbab2ce22d7b1f;hb=1d34dd374a429b4d20130daae052a895d8c6d8c1;hp=4436f789b44edf56debe6bb8b89048cab68a737b;hpb=2c7a6087e28e5dbef634ebdffe97a0759cef1393;p=rrdtool.git

diff --git a/MakeMakefile b/MakeMakefile
index 4436f78..6397703 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -2,41 +2,87 @@
 #
 # Run this script after the first cvs checkout to build
 # makefiles and friends
-set -x
-#
-find . -name Makefile | xargs rm -f
-find . -name Makefile.in | xargs rm -f
 
-if [ 1.4.2 -gt `libtool --version | awk '{print $4}'` ]
+vcheck (){
+  perl <<PERL
+@t = split /\./, "$1";
+@v = map { int \$_ } split /\./, (split /\s+/, \`$2\`)[3];
+print "$2 = ", (join ".",@v), "  (expected $1)\n";
+\$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.5 "libtool --version"
 then
-  echo get a copy of GNU libtool >= 1.4.2
-  exit 1
+  echo "get a copy of GNU libtool >= 1.5"
+  ERROR=1
+fi
+
+#if vcheck 1.8.2  "automake  --version"
+#then
+#  if vcheck 1.8.2  "automake-1.8 --version"
+#  then
+#    echo "get a copy of GNU automake >= 1.8.2"
+#    exit 1
+#  else
+#    automake=automake-1.8
+#    aclocal="aclocal-1.8  --acdir=/usr/share/aclocal-1.8 -I /usr/share/aclocal/"
+#  fi
+#else
+#    automake="automake"
+#    aclocal="aclocal  -I /usr/pack/libtool-1.5-to/share/aclocal"
+#fi
+
+if vcheck 1.7.9  "automake  --version"
+then
+  if vcheck 1.7.9  "automake-1.7 --version"
+  then
+    echo "get a copy of GNU automake >= 1.79"
+    ERROR=1
+  else
+    automake=automake-1.7
+    aclocal="aclocal-1.7  --acdir=/usr/share/aclocal-1.7 -I /usr/share/aclocal/"
+  fi
+else
+    automake="automake"
+    aclocal="aclocal -I /usr/pack/libtool-1.5-to/share/aclocal"
 fi
 
-if [ 1.5 -gt `automake --version | head -1 | awk '{print $4}'` ]
+if vcheck 2.58 "autoconf --version"
 then
-  echo get a copy of GNU automake >= 1.5
-  exit 1
+  echo "get a copy of GNU autoconf >= 2.58"
+  ERROR=1
 fi
 
-if [ 2.52 -gt `autoconf --version | head -1 | awk '{print $4}'` ]
+if [ $ERROR -ne 0 ]
 then
-  echo get a copy of GNU autoconf >= 2.52
   exit 1
 fi
 
+set -x
+find . -name Makefile | xargs rm -f
+find . -name "*.la" | xargs rm -f
+find . -name Makefile.in | xargs rm -f
+find . -name .libs | xargs rm -r
+find . -name .debs | xargs rm -r
 
 
-# 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/libtool/libtool-1.5.tar.gz
+libtoolize --copy --force
+#cp ltmain.sh config
 
-# wget ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.gz
-autoconf 
+# 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
+$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