summaryrefslogtreecommitdiff
path: root/buildconf
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2002-07-21 13:09:07 (GMT)
committerSascha Schumann <sas@php.net>2002-07-21 13:09:07 (GMT)
commit2247d61e171f56b2557dd5243fb8157a53f5a3c6 (patch)
treeb431d7d29b6f2b34eebf9d622f7466d1413637ba /buildconf
parent71e7b5cc99bc19e71d23e6482ee81d258e87625c (diff)
downloadphp-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 'buildconf')
-rwxr-xr-xbuildconf21
1 files changed, 0 insertions, 21 deletions
diff --git a/buildconf b/buildconf
index d07947d..5cd9ade 100755
--- 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"