X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=MakeMakefile;h=057c6296a8a9490ab044400cac32bd5cd954800b;hp=026f0a9d7d24a50a2ff06bf8a7f5efb975f6f93f;hb=299d1636596a1911659e0a53bfad5c47e72835e0;hpb=8fafd09727d58545c1229ca84b94f0082af6a528

diff --git a/MakeMakefile b/MakeMakefile
index 026f0a9..057c629 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,18 +49,22 @@ 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 | grep -v win32 | grep -v netware | xargs rm -f _UNKNONW_
-find . -name "*.la" | xargs rm -f _UNKNOWN_
-find . -name Makefile.in | xargs rm -f _UNKNONW_
-find . -name .libs | xargs rm -r 
-find . -name .debs | xargs rm -r
+if [ -e Makefile ]
+then
+  make clean >/dev/null
+fi
 
 intltoolize --automake -c -f
 $aclocal
@@ -69,3 +73,5 @@ autoheader --force
 $aclocal
 $automake --foreign --add-missing --force-missing --copy 
 autoconf --force
+
+# vim: set syntax=sh :