X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=MakeMakefile;h=6397703e9f7660dd5194118247cbab2ce22d7b1f;hb=5cbb7b068f19aa61d11ad526c0ac66d51ee20065;hp=59d098f1e0a22161fa2518284f4af2b382d78c08;hpb=b837c0527f117b54845242ee7626df6d88394444;p=rrdtool.git

diff --git a/MakeMakefile b/MakeMakefile
index 59d098f..6397703 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -13,22 +13,52 @@ exit \$v
 PERL
 }
 
+ERROR=0
 
 if vcheck 1.5 "libtool --version"
 then
   echo "get a copy of GNU libtool >= 1.5"
-  exit 1
+  ERROR=1
 fi
 
-if vcheck 1.7.9  "automake --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.9"
-  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.54"
+  echo "get a copy of GNU autoconf >= 2.58"
+  ERROR=1
+fi
+
+if [ $ERROR -ne 0 ]
+then
   exit 1
 fi
 
@@ -40,8 +70,6 @@ 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
@@ -50,8 +78,8 @@ libtoolize --copy --force
 # 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
+$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