Commit:    54d82a962c635e4b355462c77bfbc244b4351702
Author:    Hannes Magnusson <bj...@php.net>         Sat, 24 Mar 2012 17:20:36 
+0100
Parents:   1772a5a2e3c41baf39461e6da236b3289914c07c 
7a1c76538541e74719faf2311d72a70acd3c01e4
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=54d82a962c635e4b355462c77bfbc244b4351702

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  This is a git checkout
  Revert incorrect fix

Changed paths:
  MM  configure.in


Diff:
54d82a962c635e4b355462c77bfbc244b4351702
diff --combined configure.in
index 69a13df,49a88b1..37441ee
--- a/configure.in
+++ b/configure.in
@@@ -118,9 -118,9 +118,9 @@@ int zend_sprintf(char *buffer, const ch
  ])
  
  PHP_MAJOR_VERSION=5
 -PHP_MINOR_VERSION=4
 -PHP_RELEASE_VERSION=1
 -PHP_EXTRA_VERSION="RC1-dev"
 +PHP_MINOR_VERSION=5
 +PHP_RELEASE_VERSION=0
 +PHP_EXTRA_VERSION="-dev"
  
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
  PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
  
@@@ -233,7 -233,7 +233,7 @@@ dnl Check if bison generated files exis
  case $php_cv_bison_version in
    ""|invalid[)]
      if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f 
"$abs_srcdir/Zend/zend_language_parser.c" ; then
-       AC_MSG_ERROR([bison is required to build PHP/Zend when building a SVN 
checkout!])
+       AC_MSG_ERROR([bison is required to build PHP/Zend when building a GIT 
checkout!])
      fi
      ;;
  esac
@@@ -784,7 -784,7 +784,7 @@@ if test "$PHP_GCOV" = "yes"; the
      AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. 
You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
    fi
    
 -  ltp_version_list="1.5 1.6 1.7"
 +  ltp_version_list="1.5 1.6 1.7 1.9"
  
    AC_CHECK_PROG(LTP, lcov, lcov)
    AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
@@@ -1587,9 -1587,9 +1587,9 @@@ cat <<
  X
    fi
  
 -  if test "$PHP_SAPI" = "apache2handler" || test "$PHP_SAPI" = 
"apache2filter"; then
 -    if test "$APACHE_VERSION" -ge 2004001; then
 -      if test -z "$APACHE_THREADED_MPM"; then
 +    if test "$PHP_SAPI" = "apache2handler" || test "$PHP_SAPI" = 
"apache2filter"; then
 +      if test "$APACHE_VERSION" -ge 2004001; then
 +        if test -z "$APACHE_THREADED_MPM"; then
  cat <<X
  +--------------------------------------------------------------------+
  |                        *** WARNING ***                             |
@@@ -1598,9 -1598,9 +1598,9 @@@
  | If you change Apache to use a threaded MPM you must reconfigure    |
  | PHP with --enable-maintainer-zts                                   |
  X
 +        fi
        fi
      fi
 -  fi
  
    # Warn about linking Apache with libpthread if oci8 extension is enabled on 
linux.
    if test "$PHP_OCI8" != "no"; then


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to