Move autoconf-2.13 check into buildcheck.sh where we already have

version parsing code and (more importantly) proper error checking
for missing autoconf.

diff --git a/build/build.mk b/build/build.mk
index 70004544824402f0e968d24e268dd01f61828aff..6235ddefa67155cf4c7441b208c2c7931fbb236d 100644 (file)
--- a/build/build.mk
+++ b/build/build.mk
@@ -40,7 +40,7 @@ generated_lists:
                $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
 
 $(STAMP): build/buildcheck.sh
-       @build/buildcheck.sh && touch $(STAMP)
+       @build/buildcheck.sh $(STAMP)
 
 snapshot:
        distname='$(DISTNAME)'; \

diff --git a/build/buildcheck.sh b/build/buildcheck.sh
index b7f197e6b3bcdc394fee2342fe77c5f07549cd37..d3f267c580c43e86728e08123ad19b4239ba6d5f 100755 (executable)
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -16,11 +16,13 @@
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.18 2002-06-26 18:42:50 sniper Exp $ 
+# $Id: buildcheck.sh,v 1.19 2002-07-21 13:09:07 sas Exp $ 
 #
 
 echo "buildconf: checking installation..."
 
+stamp=$1
+
 # autoconf 2.13 or newer
 ac_version=`autoconf --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ac_version"; then
@@ -40,6 +42,15 @@ echo "buildconf: autoconf version $ac_version (ok)"
 fi
 
 
+if test "$1" = "2" && test "$2" -ge "50"; then
+  echo "buildconf: Your version of autoconf likely contains buggy cache code."
+  echo "           Running cvsclean for you."
+  echo "           To avoid this, install autoconf-2.13 and automake-1.5."
+  ./cvsclean
+  stamp=
+fi
+
+
 # automake 1.4 or newer
 am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 am_version_clean=`echo $am_version|sed -e 's/-p[0-9]*$//'`
@@ -91,4 +102,6 @@ if test "$am_prefix" != "$lt_prefix"; then
     echo "         continuing anyway"
 fi
 
+test -n "$stamp" && touch $stamp
+
 exit 0

diff --git a/buildconf b/buildconf
index d07947d7a9e123b8157b7a4a7ac6edfd3cd54848..5cd9ade76e60bdf557d1ce51f7a04e836d22dfe6 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -1,14 +1,6 @@
 #!/bin/sh
 # $Id$
 
-acv=`autoconf --version | grep GNU |cut -d ' ' -f 4`     
-res=`expr $acv '>=' 2.5`
-
-if test $res = 1; then
-    echo "cleaning checkout to force rebuild, due to bad autoconf"
-    ./cvsclean
-fi
-
 while test $# -gt 0; do
     if test "$1" = "--copy"; then
         automake_flags=--copy
@@ -27,19 +19,6 @@ if test -z "$ZENDDIR"; then
     echo "using default Zend directory"
 fi
  
-## build.mk does not check aclocal exit status yet
-##
-#mv aclocal.m4 aclocal.m4.old 2>/dev/null
-#aclocal
-#if test "$?" != "0" -a "$am_prefix" != "$lt_prefix"; then
-#    echo "buildconf: ERROR: aclocal failed, probably because automake and"
-#    echo "           libtool are installed with different prefixes;"
-#    echo "           automake is installed in $am_prefix, but libtool in $lt_prefix."
-#    echo "           Please re-install automake and/or libtool with a common prefix"
-#    echo "           and try again."
-#    exit 1
-#fi
-
 rm -f generated_lists
 
 ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"