Remove some more redundant checks. buildconf is not but a simple wrapper

for build.mk & co.

diff --git a/buildcheck.sh b/buildcheck.sh
index 75151096c8c3c7c43a8bd8d42414a355588993f4..96974450fda836da805fe5438be58ea1e9986ecf 100755 (executable)
--- a/buildcheck.sh
+++ b/buildcheck.sh
@@ -58,4 +58,12 @@ echo "           to build PHP from CVS."
 exit 1
 fi
 
+am_prefix=`which automake | sed -e 's#/[^/]*/[^/]*$##'`
+lt_prefix=`which libtool | sed -e 's#/[^/]*/[^/]*$##'`
+if test "$am_prefix" != "$lt_prefix"; then
+    echo "WARNING: automake and libtool are installed in different"
+    echo "         directories.  This may cause aclocal to fail."
+    echo "         continuing anyway"
+fi
+
 exit 0

diff --git a/buildconf b/buildconf
index dfe59f3a7f4856e64f6118ae054e03a8d0270f63..dffae5493979ecd889da824df64f3801487448bc 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -2,117 +2,11 @@
 
 supplied_flag=$1
 
-# do some version checking for the tools we use
-if test "$1" = "--force"; then
-    shift
-# this is a posix correct "test -nt"
-elif test "`ls -t build.mk buildconf buildconf.stamp 2>/dev/null |head -1`" = "buildconf.stamp"; then
-    :
-else
-    echo "buildconf: checking installation..."
-
-    # 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 "$ac_version" = ""; then
-       echo "buildconf: autoconf not found."
-       echo "           You need autoconf version 2.13 or newer installed"
-       echo "           to build PHP from CVS."
-       exit 1
-    fi
-    IFS=.; set $ac_version; IFS=' '
-    if test "$1" = "2" -a "$2" -lt "13" || test "$1" -lt "2"; then
-       echo "buildconf: autoconf version $ac_version found."
-       echo "           You need autoconf version 2.13 or newer installed"
-       echo "           to build PHP from CVS."
-       exit 1
-    else
-       echo "buildconf: autoconf version $ac_version (ok)"
-    fi
-
-    # automake 1.4 or newer
-    am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
-    if test "$am_version" = ""; then
-       echo "buildconf: automake not found."
-       echo "           You need automake version 1.4 or newer installed"
-       echo "           to build PHP from CVS."
-       exit 1
-    fi
-    IFS=.; set $am_version; IFS=' '
-    if test "$1" = "1" -a "$2" -lt "4" || test "$1" -lt "1"; then
-       echo "buildconf: automake version $am_version found."
-       echo "           You need automake version 1.4 or newer installed"
-       echo "           to build PHP from CVS."
-       exit 1
-    else
-       echo "buildconf: automake version $am_version (ok)"
-    fi
-
-    # libtool 1.3.3 or newer
-    lt_pversion=`libtool --version 2>/dev/null|sed -e 's/^[^0-9]*//' -e 's/[- ].*//'`
-    if test "$lt_pversion" = ""; then
-       echo "buildconf: libtool not found."
-       echo "           You need libtool version 1.3 or newer installed"
-       echo "           to build PHP from CVS."
-       exit 1
-    fi
-    lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
-    IFS=.; set $lt_version; IFS=' '
-    if test "$1" -gt "1" || test "$2" -gt "3" || test "$2" = "3" -a "$3" -ge "3"
-    then
-       echo "buildconf: libtool version $lt_pversion (ok)"
-    else
-       echo "buildconf: libtool version $lt_pversion found."
-       echo "           You need libtool version 1.3.3 or newer installed"
-       echo "           to build PHP from CVS."
-       exit 1
-    fi
-    touch buildconf.stamp
-fi
-
-am_prefix=`which automake | sed -e 's#/[^/]*/[^/]*$##'`
-lt_prefix=`which libtool | sed -e 's#/[^/]*/[^/]*$##'`
-if test "$am_prefix" != "$lt_prefix"; then
-    echo "buildconf: WARNING: automake and libtool are installed in different"
-    echo "           directories.  This may cause aclocal to fail."
-    echo "buildconf: continuing anyway"
-fi
-
 if test "$supplied_flag" = "--copy"; then
     automake_flags=--copy
 fi
 
-if test ! -d libzend; then
-    if test -d ../libzend; then
-       echo "buildconf: linking ../libzend to ./libzend"
-        ln -s ../libzend .
-    else
-        echo "buildconf: can not find libzend"
-        echo "           libzend should be installed in . or .., how to fetch:"
-       echo ""
-       echo "             cvs -d :pserver:cvsread@cvs.zend.com:/repository login"
-       echo "             (password \"zend\")"
-       echo "             cvs -d :pserver:cvsread@cvs.zend.com:/repository co libzend"
-       echo ""
-       exit 1
-    fi
-fi
-if test ! -d TSRM; then
-    if test -d ../TSRM; then
-       echo "buildconf: linking ../TSRM to ./TSRM"
-        ln -s ../TSRM .
-    else
-        echo "buildconf: can not find TSRM"
-        echo "           TSRM should be installed in . or .., how to fetch:"
-       echo ""
-       echo "             cvs -d :pserver:cvsread@cvs.zend.com:/repository login"
-       echo "             (password \"zend\")"
-       echo "             cvs -d :pserver:cvsread@cvs.zend.com:/repository co TSRM"
-       echo ""
-       exit 1
-    fi
-fi
-
-## build.mk does not check automake/libtool prefixes yet.
+## build.mk does not check aclocal exit status yet
 ##
 #mv aclocal.m4 aclocal.m4.old 2>/dev/null
 #aclocal