Re: cvs: php4 /build buildcheck.sh

hi, one more thing - after this patch buildconf reports automake's ver incorrectly... here is my fix Index: build/buildcheck.sh =================================================================== RCS file: /repository/php4/build/buildcheck.sh,v retrieving revision 1.10 diff -u -r1.10 buildcheck.sh --- build/buildcheck.sh 2001/05/23 19:13:24 1.10 +++ build/buildcheck.sh 2001/05/24 02:13:46 @@ -40,7 +40,8 @@ fi # automake 1.4 or newer -am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//' -e 's/-p[0-9]*$//'` +am_version_pr=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` +am_version=echo $am_version_pr|sed -e 's/-p[0-9]*$//' if test "$am_version" = ""; then echo "buildconf: automake not found." echo " You need automake version 1.4 or newer installed" @@ -49,12 +50,12 @@ 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 "buildconf: automake version $am_version_pr 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)" +echo "buildconf: automake version $am_version_pr (ok)" fi # libtool 1.3.3 or newer ----- Original Message ----- From: "Sascha Schumann" <sascha@schumann.cx> To: <php-cvs@lists.php.net> Sent: Wednesday, May 23, 2001 10:13 PM Subject: [PHP-CVS] cvs: php4 /build buildcheck.sh > sas Wed May 23 12:13:24 2001 EDT > > Modified files: > /php4/build buildcheck.sh > Log: > automake 1.4-p1 was released. Remove the -p\d+ suffix as this caused > an error message on FreeBSD. > > > Index: php4/build/buildcheck.sh > diff -u php4/build/buildcheck.sh:1.9 php4/build/buildcheck.sh:1.10 > --- php4/build/buildcheck.sh:1.9 Wed May 23 12:10:06 2001 > +++ php4/build/buildcheck.sh Wed May 23 12:13:24 2001 > @@ -16,7 +16,7 @@ > # | Sascha Schumann <sascha@schumann.cx> | > # +----------------------------------------------------------------------+ > # > -# $Id: buildcheck.sh,v 1.9 2001/05/23 19:10:06 sas Exp $ > +# $Id: buildcheck.sh,v 1.10 2001/05/23 19:13:24 sas Exp $ > # > > echo "buildconf: checking installation..." > @@ -40,7 +40,7 @@ > 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=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//' -e 's/-p[0-9]*$//'` > if test "$am_version" = ""; then > echo "buildconf: automake not found." > echo " You need automake version 1.4 or newer installed" > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net > For additional commands, e-mail: php-cvs-help@lists.php.net > To contact the list administrators, e-mail: php-list-admin@lists.php.net > >