X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=MakeMakefile;h=ba642cf92a2aa6f2fc369078b38c9bb910219556;hb=b52501e79a33df06a0f67203c2e1b57cafdc6fdf;hp=4aba88c6fcd3d98a9290ec1c17bb0f819aba2f9e;hpb=d8c6bad0b7fa3852c16c1bdd65f9ce079e6920c7;p=rrdtool.git

diff --git a/MakeMakefile b/MakeMakefile
index 4aba88c..ba642cf 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -3,11 +3,14 @@
 # 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
@@ -29,7 +32,10 @@ then
     ERROR=1
   else
     automake=automake-1.9
-    aclocal="aclocal-1.9  --acdir=/usr/share/aclocal-1.9 -I /usr/share/aclocal/"
+    aclocal="aclocal-1.9"
+    for d in /usr/pack/automake-1.9.5-to/share/aclocal-1.9 /usr/share/aclocal-1.9 /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"
@@ -43,24 +49,29 @@ 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
+if [ -e Makefile ]
+then
+  make clean >/dev/null
+fi
 
+intltoolize --automake -c -f
+$aclocal
 libtoolize --copy --force
+autoheader --force  
 $aclocal
-$automake --foreign --add-missing --force-missing --copy --warnings=all
-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 :