X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=MakeMakefile;h=2765238a7ddf1dfe6e25eb1391c238f28204c359;hp=6397703e9f7660dd5194118247cbab2ce22d7b1f;hb=85cd3f3afae48026843bea34d2d0d1056ee9dda5;hpb=9baf751026b7f2c0983e09df7398bad28ddb6577

diff --git a/MakeMakefile b/MakeMakefile
index 6397703..2765238 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -3,86 +3,88 @@
 # Run this script after the first cvs checkout to build
 # makefiles and friends
 
+#PATH="/usr/sepp/bin:$PATH"
+#export PATH
+
 vcheck (){
   perl <<PERL
 @t = split /\./, "$1";
 @v = map { int \$_ } split /\./, (split /\s+/, \`$2\`)[3];
-print "$2 = ", (join ".",@v), "  (expected $1)\n";
+print "$2 = ", (join ".",@v), "  (expecting $1 or later)\n";
 \$v = \$t[0]*1000000+\$t[1]*1000+\$t[2] <= \$v[0]*1000000+\$v[1]*1000+\$v[2];
 exit \$v
 PERL
 }
 
 ERROR=0
+LIBTOOL_VER="1.5.6"
+AUTOMAKE_VER="1.9.2"
+AUTOCONF_VER="2.59"
+INTLTOOL_VER="0.35.0"
 
-if vcheck 1.5 "libtool --version"
+if vcheck $LIBTOOL_VER "libtool --version"
 then
-  echo "get a copy of GNU libtool >= 1.5"
+  echo "get a copy of GNU libtool >= $LIBTOOL_VER"
   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"
+if vcheck $AUTOMAKE_VER  "automake  --version"
 then
-  if vcheck 1.7.9  "automake-1.7 --version"
+  if vcheck $AUTOMAKE_VER  "automake-1.9 --version"
   then
-    echo "get a copy of GNU automake >= 1.79"
+    echo "get a copy of GNU automake >= $AUTOMAKE_VER"
     ERROR=1
   else
-    automake=automake-1.7
-    aclocal="aclocal-1.7  --acdir=/usr/share/aclocal-1.7 -I /usr/share/aclocal/"
+    automake=automake-1.9
+    aclocal="aclocal-1.9"
+    for d in /usr/pack/automake-1.9.5-to/share/aclocal-1.9 /usr/share/aclocal-1.9 /usr/share/aclocal /usr/pack/rrdtool-1.3svn-to/share/aclocal /usr/pack/intltool-0.37.0-to/share/aclocal ; do
+      [ -d $d ] && aclocal="$aclocal -I $d"
+    done
   fi
 else
     automake="automake"
-    aclocal="aclocal -I /usr/pack/libtool-1.5-to/share/aclocal"
+    aclocal="aclocal"
+#    aclocal="aclocal -I /usr/pack/libtool-1.5.14-to/share/aclocal"
 fi
 
-if vcheck 2.58 "autoconf --version"
+if vcheck $AUTOCONF_VER "autoconf --version"
 then
-  echo "get a copy of GNU autoconf >= 2.58"
+  echo "get a copy of GNU autoconf >= $autoconf_ver"
   ERROR=1
 fi
 
+if vcheck $INTLTOOL_VER "intltoolize --version"
+then
+  echo "get a copy of GNU intltoolize >= $INTLTOOL_VER"
+  ERROR=1
+fi
+	
 if [ $ERROR -ne 0 ]
 then
   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
+# remove the bits we are going to recreate
 
-
-# wget ftp://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz
+echo Removing old Makefiles
+touch Makefile
+find . -name "Makefile" -or -name "Makefile.in" -print0 | xargs -0 rm 
+echo Cleaning out other leftovers
+for x in configure install-sh intltool-merge.in rrd_config.h.in \
+         missing intltool-update po/Makefile.in.in config.sub \
+         intltool-extract intltool-extract.in config.guess \
+         depcomp intltool-update.in autom4te.cache \
+         intltool-merge compile; do
+  [ ! -L $x -a -d $x ] && rm -r "$x"
+  [ ! -L $x -a -f $x ] && rm "$x"
+done
+set -x
+intltoolize --automake -c -f
+$aclocal
 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.
+autoheader --force  
 $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  
-
+$automake --foreign --add-missing --force-missing --copy 
+autoconf --force
 
+# vim: set syntax=sh :