X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=MakeMakefile;h=6397703e9f7660dd5194118247cbab2ce22d7b1f;hb=06c64aacf29db1bbf135e80aa98ec03ec8c6719c;hp=28c62ed9b30f83e28411294d156bffa7b70b272d;hpb=8151a639ec21325d10f5d9c79f5260d3f2c7bc14;p=rrdtool.git

diff --git a/MakeMakefile b/MakeMakefile
index 28c62ed..6397703 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -13,22 +13,52 @@ exit \$v
 PERL
 }
 
+ERROR=0
 
-if vcheck 1.4.2 "libtool --version"
+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.7  "automake-1.7 --version"
+#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
-  echo "get a copy of GNU automake >= 1.7"
-  exit 1
+  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 vcheck 2.58 "autoconf --version"
+then
+  echo "get a copy of GNU autoconf >= 2.58"
+  ERROR=1
 fi
 
-if vcheck 2.54 "autoconf --version"
+if [ $ERROR -ne 0 ]
 then
-  echo "get a copy of GNU autoconf >= 2.54"
   exit 1
 fi
 
@@ -36,22 +66,23 @@ 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
+# wget ftp://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz
 libtoolize --copy --force
-cp ltmain.sh config
+#cp ltmain.sh config
 
-# wget ftp://sources.redhat.com/pub/automake/automake-1.5.tar.gz
+# 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
-autoheader --warnings=all
-automake-1.7 --foreign --add-missing --force-missing --copy 
-
-# wget ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.gz
-autoconf 
+$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