diff options
| -rw-r--r-- | acinclude.m4 | 22 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | ext/mbstring/config.m4 | 8 | ||||
| -rw-r--r-- | ext/pdo_dblib/config.m4 | 10 | ||||
| -rw-r--r-- | ext/pdo_firebird/config.m4 | 2 | ||||
| -rwxr-xr-x | ext/pdo_mysql/config.m4 | 10 | ||||
| -rwxr-xr-x | ext/pdo_oci/config.m4 | 10 | ||||
| -rwxr-xr-x | ext/pdo_odbc/config.m4 | 10 | ||||
| -rw-r--r-- | ext/pdo_pgsql/config.m4 | 10 | ||||
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 12 | ||||
| -rw-r--r-- | ext/sqlite/config.m4 | 8 | ||||
| -rw-r--r-- | ext/standard/config.m4 | 8 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.c | 2 |
13 files changed, 61 insertions, 61 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2c9fc30992..5c3c7577a7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1688,7 +1688,7 @@ dnl PHP_BROKEN_GLIBC_FOPEN_APPEND dnl AC_DEFUN([PHP_BROKEN_GLIBC_FOPEN_APPEND], [ AC_MSG_CHECKING([for broken libc stdio]) - AC_CACHE_VAL(have_broken_glibc_fopen_append,[ + AC_CACHE_VAL(_cv_have_broken_glibc_fopen_append,[ AC_TRY_RUN([ #include <stdio.h> int main(int argc, char *argv[]) @@ -1714,8 +1714,8 @@ int main(int argc, char *argv[]) return 0; } ], -[have_broken_glibc_fopen_append=no], -[have_broken_glibc_fopen_append=yes ], +[_cv_have_broken_glibc_fopen_append=no], +[_cv_have_broken_glibc_fopen_append=yes ], AC_TRY_COMPILE([ #include <features.h> ],[ @@ -1723,11 +1723,11 @@ AC_TRY_COMPILE([ choke me #endif ], -[have_broken_glibc_fopen_append=yes], -[have_broken_glibc_fopen_append=no ]) +[_cv_have_broken_glibc_fopen_append=yes], +[_cv_have_broken_glibc_fopen_append=no ]) )]) - if test "$have_broken_glibc_fopen_append" = "yes"; then + if test "$_cv_have_broken_glibc_fopen_append" = "yes"; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_BROKEN_GLIBC_FOPEN_APPEND,1, [Define if your glibc borks on fopen with mode a+]) else @@ -2736,17 +2736,17 @@ dnl dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]]) dnl AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[ - AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [ + AC_CACHE_CHECK([for PDO includes], pdo_cv_inc_path, [ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$prefix/include/php/ext + pdo_cv_inc_path=$prefix/include/php/ext fi ]) - if test -n "$pdo_inc_path"; then + if test -n "$pdo_cv_inc_path"; then ifelse([$1],[],:,[$1]) else ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2]) diff --git a/configure.in b/configure.in index 4d729fcc54..95ca1bd15f 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ ## $Id$ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) +divert(1001) dnl ## Diversion 1 is the autoconf + automake setup phase. We also dnl ## set the PHP version, deal with platform-specific compile @@ -305,7 +305,7 @@ sinclude(TSRM/threads.m4) sinclude(TSRM/tsrm.m4) -divert(2) +divert(1002) dnl ## Diversion 2 is where we set PHP-specific options and come up dnl ## with reasonable default values for them. We check for pthreads here @@ -344,7 +344,7 @@ if test "$enable_maintainer_zts" = "yes"; then PTHREADS_FLAGS fi -divert(3) +divert(1003) dnl ## In diversion 3 we check for compile-time options to the PHP dnl ## core and how to deal with different system dependencies. @@ -691,7 +691,7 @@ if test "x$php_crypt_r" = "x1"; then PHP_CRYPT_R_STYLE fi -divert(4) +divert(1004) dnl ## In diversion 4 we check user-configurable general settings. @@ -932,7 +932,7 @@ else AC_MSG_RESULT([using system default]) fi -divert(5) +divert(1005) dnl ## In diversion 5 we check which extensions should be compiled. dnl ## All of these are normally in the extension directories. diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index a5e7920cdf..0b24884042 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -74,7 +74,7 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check multibyte regex backtrack]) fi - AC_CACHE_CHECK(for variable length prototypes and stdarg.h, cv_php_mbstring_stdarg, [ + AC_CACHE_CHECK(for variable length prototypes and stdarg.h, php_cv_mbstring_stdarg, [ AC_TRY_RUN([ #include <stdarg.h> int foo(int x, ...) { @@ -86,14 +86,14 @@ int foo(int x, ...) { return 0; } int main() { return foo(10, "", 3.14); } - ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], [ + ], [php_cv_mbstring_stdarg=yes], [php_cv_mbstring_stdarg=no], [ dnl cross-compile needs something here case $host_alias in *netware*) - cv_php_mbstring_stdarg=yes + php_cv_mbstring_stdarg=yes ;; *) - cv_php_mbstring_stdarg=no + php_cv_mbstring_stdarg=no ;; esac ]) diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4 index 3410ba9c6b..ba8244c721 100644 --- a/ext/pdo_dblib/config.m4 +++ b/ext/pdo_dblib/config.m4 @@ -59,19 +59,19 @@ if test "$PHP_PDO_DBLIB" != "no"; then ],[ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$prefix/include/php/ext + pdo_cv_inc_path=$prefix/include/php/ext else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_inc_path) + AC_MSG_RESULT($pdo_cv_inc_path) ]) PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\"" - PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_DBLIB_DEFS) + PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_DBLIB_DEFS) AC_CHECK_LIB(dnet_stub, dnet_addr, [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD) AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ]) diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4 index 94704d3adb..7b6f669a50 100644 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@ -50,7 +50,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_INCLUDE($FIREBIRD_INCDIR) AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ]) - PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_inc_path) + PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_cv_inc_path) PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo) fi diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index fc5fc8102a..66e26fcb4f 100755 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -148,20 +148,20 @@ if test "$PHP_PDO_MYSQL" != "no"; then ],[ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$prefix/include/php/ext + pdo_cv_inc_path=$prefix/include/php/ext else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_inc_path) + AC_MSG_RESULT($pdo_cv_inc_path) ]) dnl fix after renaming to pdo_mysql - PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path -I) + PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_cv_inc_path -I) ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo) diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index 9ae270e57e..b96a1b770d 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -199,18 +199,18 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_ ],[ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$prefix/include/php/ext + pdo_cv_inc_path=$prefix/include/php/ext else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_inc_path) + AC_MSG_RESULT($pdo_cv_inc_path) ]) - PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_inc_path) + PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_cv_inc_path) PHP_SUBST_OLD(PDO_OCI_SHARED_LIBADD) PHP_SUBST_OLD(PDO_OCI_DIR) diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4 index 36e506bd2c..b70dc9d539 100755 --- a/ext/pdo_odbc/config.m4 +++ b/ext/pdo_odbc/config.m4 @@ -47,15 +47,15 @@ if test "$PHP_PDO_ODBC" != "no"; then ],[ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$prefix/include/php/ext + pdo_cv_inc_path=$prefix/include/php/ext else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_inc_path) + AC_MSG_RESULT($pdo_cv_inc_path) ]) AC_MSG_CHECKING([for selected PDO ODBC flavour]) @@ -165,7 +165,7 @@ functions required for PDO support. AC_MSG_ERROR([Your ODBC library does not exist or there was an error. Check config.log for more information]) ], $PDO_ODBC_LDFLAGS) - PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE) + PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE) PHP_SUBST(PDO_ODBC_SHARED_LIBADD) ifdef([PHP_ADD_EXTENSION_DEP], [ diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4 index 4a118ca810..f63c178f54 100644 --- a/ext/pdo_pgsql/config.m4 +++ b/ext/pdo_pgsql/config.m4 @@ -109,18 +109,18 @@ if test "$PHP_PDO_PGSQL" != "no"; then ],[ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$prefix/include/php/ext + pdo_cv_inc_path=$prefix/include/php/ext else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_inc_path) + AC_MSG_RESULT($pdo_cv_inc_path) ]) - PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS) + PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_PGSQL_CFLAGS) ifdef([PHP_ADD_EXTENSION_DEP], [ PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo) diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 4e6dd2cb12..b2b70a5038 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -19,15 +19,15 @@ if test "$PHP_PDO_SQLITE" != "no"; then ],[ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$prefix/include/php/ext + pdo_cv_inc_path=$prefix/include/php/ext else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_inc_path) + AC_MSG_RESULT($pdo_cv_inc_path) ]) php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c" @@ -70,7 +70,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then ]) PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) - PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_inc_path) + PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_cv_inc_path) else # use bundled libs if test "$enable_maintainer_zts" = "yes"; then @@ -92,7 +92,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, - $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path) + $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_cv_inc_path) PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3) diff --git a/ext/sqlite/config.m4 b/ext/sqlite/config.m4 index dbee55fa94..a1699142ea 100644 --- a/ext/sqlite/config.m4 +++ b/ext/sqlite/config.m4 @@ -48,9 +48,9 @@ AC_DEFUN([PHP_PROG_LEMON],[ if test "$PHP_SQLITE" != "no"; then if test "$PHP_PDO" != "no"; then PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])]) - if test -n "$pdo_inc_path"; then + if test -n "$pdo_cv_inc_path"; then AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO]) - pdo_inc_path="-I$pdo_inc_path" + pdo_cv_inc_path="-I$pdo_cv_inc_path" fi fi @@ -83,13 +83,13 @@ if test "$PHP_SQLITE" != "no"; then -L$SQLITE_DIR/$PHP_LIBDIR -lm ]) SQLITE_MODULE_TYPE=external - PHP_SQLITE_CFLAGS=$pdo_inc_path + PHP_SQLITE_CFLAGS=$pdo_cv_inc_path sqlite_extra_sources="libsqlite/src/encode.c" else # use bundled library PHP_PROG_LEMON SQLITE_MODULE_TYPE=builtin - PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" + PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_cv_inc_path" sqlite_extra_sources="libsqlite/src/opcodes.c \ libsqlite/src/parse.c libsqlite/src/encode.c \ libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index e0f04e0bd4..16610f0f34 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -226,15 +226,15 @@ dnl dnl Check if there is a support means of creating a new process dnl and defining which handles it receives dnl -AC_CACHE_VAL(php_can_support_proc_open,[ +AC_CACHE_VAL(php_cv_can_support_proc_open,[ AC_CHECK_FUNCS(fork CreateProcess, [ - php_can_support_proc_open=yes + php_cv_can_support_proc_open=yes break ],[ - php_can_support_proc_open=no + php_cv_can_support_proc_open=no ])]) AC_MSG_CHECKING([if your OS can spawn processes with inherited handles]) -if test "$php_can_support_proc_open" = "yes"; then +if test "$php_cv_can_support_proc_open" = "yes"; then AC_MSG_RESULT(yes) AC_DEFINE(PHP_CAN_SUPPORT_PROC_OPEN,1, [Define if your system has fork/vfork/CreateProcess]) else diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 9bde6cbdc3..134b7e3616 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Wed Apr 8 09:34:35 2009 */ +/* Generated by re2c 0.13.5 on Mon Nov 23 09:26:17 2009 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ |