cvs: php4 / buildconf /build build.mk buildcheck.sh

sas Sun Jul 21 09:09:07 2002 EDT Modified files: /php4 buildconf /php4/build build.mk buildcheck.sh Log: Move autoconf-2.13 check into buildcheck.sh where we already have version parsing code and (more importantly) proper error checking for missing autoconf. Index: php4/buildconf diff -u php4/buildconf:1.56 php4/buildconf:1.57 --- php4/buildconf:1.56 Sat Jul 20 12:40:14 2002 +++ php4/buildconf Sun Jul 21 09:09:06 2002 @@ -1,13 +1,5 @@ #!/bin/sh -# $Id: buildconf,v 1.56 2002/07/20 16:40:14 imajes Exp $ - -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 +# $Id: buildconf,v 1.57 2002/07/21 13:09:06 sas Exp $ while test $# -gt 0; do if test "$1" = "--copy"; then @@ -27,19 +19,6 @@ 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" Index: php4/build/build.mk diff -u php4/build/build.mk:1.16 php4/build/build.mk:1.17 --- php4/build/build.mk:1.16 Fri Jul 12 00:41:26 2002 +++ php4/build/build.mk Sun Jul 21 09:09:07 2002 @@ -14,7 +14,7 @@ # | Author: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: build.mk,v 1.16 2002/07/12 04:41:26 sniper Exp $ +# $Id: build.mk,v 1.17 2002/07/21 13:09:07 sas Exp $ # # # Makefile to generate build tools @@ -40,7 +40,7 @@ $(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)'; \ Index: php4/build/buildcheck.sh diff -u php4/build/buildcheck.sh:1.18 php4/build/buildcheck.sh:1.19 --- php4/build/buildcheck.sh:1.18 Wed Jun 26 14:42:50 2002 +++ php4/build/buildcheck.sh Sun Jul 21 09:09:07 2002 @@ -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 @@ 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]*$//' @@ -90,5 +101,7 @@ echo " directories. This may cause aclocal to fail." echo " continuing anyway" fi + +test -n "$stamp" && touch $stamp exit 0