X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=MakeMakefile;h=aca14ccfbbbdb9c1e3c99eda2fb73c4c6e4cd0c1;hp=854e879d283dd6c8498dd57279d03bdd619e7cfc;hb=refs%2Fheads%2Fkb%2Frrdd;hpb=df4389682796c797aea62ff86e154f543f7f5250

diff --git a/MakeMakefile b/MakeMakefile
index 854e879..aca14cc 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -10,7 +10,7 @@ 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
@@ -33,7 +33,7 @@ then
   else
     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; do
+    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
@@ -49,22 +49,38 @@ then
   ERROR=1
 fi
 
+if vcheck 0.35.0 "intltoolize --version"
+then
+  echo "get a copy of GNU intltoolize >= 0.35.0"
+  ERROR=1
+fi
+	
 if [ $ERROR -ne 0 ]
 then
   exit 1
 fi
 
-# cleanup
-set -x
-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
+# remove the bits we are going to recreate
 
+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
 autoheader --force  
 $aclocal
 $automake --foreign --add-missing --force-missing --copy 
 autoconf --force
+
+# vim: set syntax=sh :