archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
version parsing code and (more importantly) proper error checking
for missing autoconf.
This commit is contained in:
Sascha Schumann 2002-07-21 13:09:07 +00:00
parent 71e7b5cc99
commit 2247d61e17
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/build.mk
View file

@ -40,7 +40,7 @@ generated_lists:
$(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@ $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
$(STAMP): build/buildcheck.sh $(STAMP): build/buildcheck.sh
@build/buildcheck.sh && touch $(STAMP) @build/buildcheck.sh $(STAMP)
snapshot: snapshot:
distname='$(DISTNAME)'; \ distname='$(DISTNAME)'; \

15
build/buildcheck.sh
View file

@ -16,11 +16,13 @@
# | Sascha Schumann <sascha@schumann.cx> | # | 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..." echo "buildconf: checking installation..."
stamp=$1
# autoconf 2.13 or newer # autoconf 2.13 or newer
ac_version=`autoconf --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` ac_version=`autoconf --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
if test -z "$ac_version"; then if test -z "$ac_version"; then
@ -40,6 +42,15 @@ echo "buildconf: autoconf version $ac_version (ok)"
fi 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 # 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=`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]*$//'` 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" echo " continuing anyway"
fi fi
test -n "$stamp" && touch $stamp
exit 0 exit 0

21
buildconf
View file

@ -1,14 +1,6 @@
#!/bin/sh #!/bin/sh
# $Id$ # $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 while test $# -gt 0; do
if test "$1" = "--copy"; then if test "$1" = "--copy"; then
automake_flags=--copy automake_flags=--copy
@ -27,19 +19,6 @@ if test -z "$ZENDDIR"; then
echo "using default Zend directory" echo "using default Zend directory"
fi 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 rm -f generated_lists
${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"