diff options
| author | Sascha Schumann <sas@php.net> | 2002-07-21 13:09:07 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2002-07-21 13:09:07 +0000 |
| commit | 2247d61e171f56b2557dd5243fb8157a53f5a3c6 (patch) | |
| tree | b431d7d29b6f2b34eebf9d622f7466d1413637ba /build | |
| parent | 71e7b5cc99bc19e71d23e6482ee81d258e87625c (diff) | |
| download | php-git-2247d61e171f56b2557dd5243fb8157a53f5a3c6.tar.gz | |
Move autoconf-2.13 check into buildcheck.sh where we already have
version parsing code and (more importantly) proper error checking
for missing autoconf.
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.mk | 2 | ||||
| -rwxr-xr-x | build/buildcheck.sh | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/build/build.mk b/build/build.mk index 7000454482..6235ddefa6 100644 --- 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 b7f197e6b3..d3f267c580 100755 --- 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 |