jani Sat May 9 20:28:04 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src acinclude.m4 NEWS
Log:
MFH: sync + - Fixed bug #47468 (enable cli|cgi-only extensions for embed
sapi)
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.28&r2=1.332.2.14.2.29&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.28
php-src/acinclude.m4:1.332.2.14.2.29
--- php-src/acinclude.m4:1.332.2.14.2.28 Mon Sep 8 10:24:38 2008
+++ php-src/acinclude.m4 Sat May 9 20:28:02 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.28 2008/09/08 10:24:38 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.29 2009/05/09 20:28:02 jani Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -920,7 +920,7 @@
])
dnl
-dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[,
cxx[, zend_ext]]]]])
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [, sapi_class [, extra-cflags
[, cxx [, zend_ext]]]]])
dnl
dnl Includes an extension in the build.
dnl
@@ -968,12 +968,15 @@
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
- if test "$PHP_SAPI" = "cgi"; then
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
- EXT_STATIC="$EXT_STATIC $1"
- else
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
- fi
+ case "$PHP_SAPI" in
+ cgi|embed[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+ EXT_STATIC="$EXT_STATIC $1"
+ ;;
+ *[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
@@ -2766,6 +2769,23 @@
)
])
+dnl PHP_DETECT_SUNCC
+dnl Detect if the systems default compiler is suncc.
+dnl We also set some usefull CFLAGS if the user didn't set any
+AC_DEFUN([PHP_DETECT_SUNCC],[
+ SUNCC="no"
+ AC_MSG_CHECKING([for suncc])
+ AC_EGREP_CPP([^__SUNPRO_C], [__SUNPRO_C],
+ SUNCC="no"
+ AC_MSG_RESULT([no]),
+ SUNCC="yes"
+ GCC="no"
+ test -n "$auto_cflags" && CFLAGS="-fsimple=2 -xnorunpath -xO4
-xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto
-xstrconst -xtarget=native -zlazyload"
+ GCC=""
+ AC_MSG_RESULT([yes])
+ )
+])
+
dnl
dnl PHP_CRYPT_R_STYLE
dnl detect the style of crypt_r() is any is available
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1491&r2=1.2027.2.547.2.1492&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1491 php-src/NEWS:1.2027.2.547.2.1492
--- php-src/NEWS:1.2027.2.547.2.1491 Thu May 7 13:45:47 2009
+++ php-src/NEWS Sat May 9 20:28:03 2009
@@ -12,7 +12,6 @@
- Fixed leaks in imap when a mail_criteria is used. (Pierre)
- Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
-
- Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
bindto). (Ilia)
- Fixed bug #48132 (configure check for curl ssl support fails with
@@ -58,6 +57,7 @@
- Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia)
- Fixed bug #47487 (performance degraded when reading large chunks after fix of
bug #44607). (Arnaud)
+- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi). (Jani)
- Fixed bug #47365 (ip2long() may allow some invalid values on certain 64bit
systems). (Ilia)
- Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
