rasmus Sun, 29 Nov 2009 06:13:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291414
Log:
Revert attempt at supporting both autoconf 2.13 and
modern versions in the same build chain. There are
simply too many broken things in 2.13 to make it work.
Cache handling is broken as well which is why I need
to revert the pdo_inc_path cache fix as well.
trunk is now 2.60+ only and I'll work on cleaning out
all the legacy cruft from there.
Changed paths:
U pecl/pdo_4d/trunk/config.m4
U pecl/pdo_ibm/trunk/config.m4
U pecl/pdo_user/trunk/config.m4
U php/php-src/branches/PHP_5_2/acinclude.m4
U php/php-src/branches/PHP_5_2/ext/pdo_dblib/config.m4
U php/php-src/branches/PHP_5_2/ext/pdo_firebird/config.m4
U php/php-src/branches/PHP_5_2/ext/pdo_mysql/config.m4
U php/php-src/branches/PHP_5_2/ext/pdo_oci/config.m4
U php/php-src/branches/PHP_5_2/ext/pdo_odbc/config.m4
U php/php-src/branches/PHP_5_2/ext/pdo_pgsql/config.m4
U php/php-src/branches/PHP_5_2/ext/pdo_sqlite/config.m4
U php/php-src/branches/PHP_5_2/ext/sqlite/config.m4
U php/php-src/branches/PHP_5_3/acinclude.m4
U php/php-src/branches/PHP_5_3/configure.in
U php/php-src/branches/PHP_5_3/ext/pdo_dblib/config.m4
U php/php-src/branches/PHP_5_3/ext/pdo_firebird/config.m4
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/config.m4
U php/php-src/branches/PHP_5_3/ext/pdo_oci/config.m4
U php/php-src/branches/PHP_5_3/ext/pdo_odbc/config.m4
U php/php-src/branches/PHP_5_3/ext/pdo_pgsql/config.m4
U php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.m4
U php/php-src/branches/PHP_5_3/ext/sqlite/config.m4
U php/php-src/branches/PHP_5_3/ext/standard/config.m4
U php/php-src/trunk/configure.in
U php/php-src/trunk/ext/standard/config.m4
Modified: pecl/pdo_4d/trunk/config.m4
===================================================================
--- pecl/pdo_4d/trunk/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ pecl/pdo_4d/trunk/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -17,18 +17,18 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
- PHP_ADD_INCLUDE($pdo_cv_inc_path)
- PHP_ADD_INCLUDE("$pdo_cv_inc_path/pdo")
+ PHP_ADD_INCLUDE($pdo_inc_path)
+ PHP_ADD_INCLUDE("$pdo_inc_path/pdo")
if test "$PHP_PDO_4D" != "yes"; then
PDO_4D_DIR=$PHP_PDO_4D
@@ -36,13 +36,13 @@
PHP_ADD_LIBRARY_WITH_PATH(4d_sql, "$PDO_4D_DIR/lib", PDO_4D_SHARED_LIBADD)
AC_DEFINE(HAVE_PDO_4D,1,[ ])
- PHP_NEW_EXTENSION(pdo_4d, pdo_4d.c 4d_driver.c 4d_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
+ PHP_NEW_EXTENSION(pdo_4d, pdo_4d.c 4d_driver.c 4d_statement.c, $ext_shared,,-I$pdo_inc_path)
else
#use bundled lib4d_sql
pdo_4d_sources=" pdo_4d.c 4d_driver.c 4d_statement.c"
lib4d_sql_sources="lib4d_sql/base64.c lib4d_sql/communication.c lib4d_sql/fourd.c lib4d_sql/fourd_interne.c lib4d_sql/fourd_result.c lib4d_sql/fourd_type.c lib4d_sql/sqlstate.c lib4d_sql/utils.c"
- PHP_NEW_EXTENSION(pdo_4d, $lib4d_sql_sources $pdo_4d_sources, $ext_shared,,-I$pdo_cv_inc_path -...@ext_srcdir@/lib4d_sql)
+ PHP_NEW_EXTENSION(pdo_4d, $lib4d_sql_sources $pdo_4d_sources, $ext_shared,,-I$pdo_inc_path -...@ext_srcdir@/lib4d_sql)
PHP_ADD_BUILD_DIR($ext_builddir/lib4d_sql)
AC_DEFINE(HAVE_PDO_4D,1,[ ])
Modified: pecl/pdo_ibm/trunk/config.m4
===================================================================
--- pecl/pdo_ibm/trunk/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ pecl/pdo_ibm/trunk/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -57,15 +57,15 @@
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
dnl Don't forget to add additional source files here
php_pdo_ibm_sources_core="pdo_ibm.c ibm_driver.c ibm_statement.c"
@@ -79,7 +79,7 @@
CPPFLAGS="$CPPFLAGS -D__H_LOCALEDEF";;
esac
- PHP_NEW_EXTENSION(pdo_ibm, $php_pdo_ibm_sources_core, $ext_shared,,-I$pdo_cv_inc_path)
+ PHP_NEW_EXTENSION(pdo_ibm, $php_pdo_ibm_sources_core, $ext_shared,,-I$pdo_inc_path)
ifdef([PHP_ADD_EXTENSION_DEP],
[
Modified: pecl/pdo_user/trunk/config.m4
===================================================================
--- pecl/pdo_user/trunk/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ pecl/pdo_user/trunk/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -16,19 +16,19 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
PHP_NEW_EXTENSION(pdo_user, pdo_user.c pdo_user_driver.c pdo_user_statement.c pdo_user_object.c \
-pdo_user_sql_tokenizer.c pdo_user_sql_parser.c, $ext_shared,,-I$pdo_cv_inc_path)
+pdo_user_sql_tokenizer.c pdo_user_sql_parser.c, $ext_shared,,-I$pdo_inc_path)
PHP_ADD_MAKEFILE_FRAGMENT
Modified: php/php-src/branches/PHP_5_2/acinclude.m4
===================================================================
--- php/php-src/branches/PHP_5_2/acinclude.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_2/acinclude.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -2736,17 +2736,17 @@
dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
dnl
AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
- AC_CACHE_CHECK([for PDO includes], pdo_cv_inc_path, [
+ AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
fi
])
- if test -n "$pdo_cv_inc_path"; then
+ if test -n "$pdo_inc_path"; then
ifelse([$1],[],:,[$1])
else
ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2])
Modified: php/php-src/branches/PHP_5_2/ext/pdo_dblib/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_dblib/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_2/ext/pdo_dblib/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -58,19 +58,19 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_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_cv_inc_path $PDO_DBLIB_DEFS)
+ PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, $ext_shared,,-I$pdo_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,[ ])
Modified: php/php-src/branches/PHP_5_2/ext/pdo_firebird/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_firebird/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_2/ext/pdo_firebird/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -45,7 +45,7 @@
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_cv_inc_path)
+ PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_inc_path)
PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD)
PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo)
fi
Modified: php/php-src/branches/PHP_5_2/ext/pdo_mysql/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_mysql/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_2/ext/pdo_mysql/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -138,18 +138,18 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
- PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
+ PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
Modified: php/php-src/branches/PHP_5_2/ext/pdo_oci/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_oci/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_2/ext/pdo_oci/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -230,18 +230,18 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($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_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_inc_path)
PHP_SUBST_OLD(PDO_OCI_SHARED_LIBADD)
PHP_SUBST_OLD(PDO_OCI_DIR)
Modified: php/php-src/branches/PHP_5_2/ext/pdo_odbc/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_odbc/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_2/ext/pdo_odbc/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -45,15 +45,15 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
AC_MSG_CHECKING([for selected PDO ODBC flavour])
@@ -157,7 +157,7 @@
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_cv_inc_path $PDO_ODBC_INCLUDE)
+ PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE)
PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
ifdef([PHP_ADD_EXTENSION_DEP],
[
Modified: php/php-src/branches/PHP_5_2/ext/pdo_pgsql/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_pgsql/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_2/ext/pdo_pgsql/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -111,18 +111,18 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
- PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_PGSQL_CFLAGS)
+ PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
Modified: php/php-src/branches/PHP_5_2/ext/pdo_sqlite/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_sqlite/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_2/ext/pdo_sqlite/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -17,15 +17,15 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
@@ -68,7 +68,7 @@
])
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
- PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_cv_inc_path)
+ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_inc_path)
else
# use bundled libs
pdo_sqlite_sources="sqlite/src/attach.c sqlite/src/auth.c sqlite/src/btree.c \
@@ -91,7 +91,7 @@
PHP_NEW_EXTENSION(pdo_sqlite,
$php_pdo_sqlite_sources_core $pdo_sqlite_sources,
- $ext_shared,,-I$ext_srcdir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_cv_inc_path)
+ $ext_shared,,-I$ext_srcdir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_inc_path)
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1)
Modified: php/php-src/branches/PHP_5_2/ext/sqlite/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sqlite/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_2/ext/sqlite/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -48,9 +48,9 @@
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_cv_inc_path"; then
+ if test -n "$pdo_inc_path"; then
AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
- pdo_cv_inc_path="-I$pdo_cv_inc_path"
+ pdo_inc_path="-I$pdo_inc_path"
fi
fi
@@ -83,13 +83,13 @@
-L$SQLITE_DIR/$PHP_LIBDIR -lm
])
SQLITE_MODULE_TYPE=external
- PHP_SQLITE_CFLAGS=$pdo_cv_inc_path
+ PHP_SQLITE_CFLAGS=$pdo_inc_path
sqlite_extra_sources="libsqlite/src/encode.c"
else
# use bundled library
PHP_PROG_LEMON
SQLITE_MODULE_TYPE=builtin
- PHP_SQLITE_CFLAGS="-...@ext_srcdir@/libsqlite/src -...@ext_builddir@/libsqlite/src $pdo_cv_inc_path"
+ PHP_SQLITE_CFLAGS="-...@ext_srcdir@/libsqlite/src -...@ext_builddir@/libsqlite/src $pdo_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 \
Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===================================================================
--- php/php-src/branches/PHP_5_3/acinclude.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/acinclude.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -29,10 +29,6 @@
AC_MSG_RESULT([${T_MD}$1${T_ME}])
])
-AC_DEFUN([PHP_DIVERT],[
- ifdef([AC_PRESERVE_HELP_ORDER], [], [ divert($1) ] )
-])
-
dnl -------------------------------------------------------------------------
dnl Build system helper macros
dnl -------------------------------------------------------------------------
@@ -2740,17 +2736,17 @@
dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
dnl
AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
- AC_CACHE_CHECK([for PDO includes], pdo_cv_inc_path, [
+ AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
fi
])
- if test -n "$pdo_cv_inc_path"; then
+ if test -n "$pdo_inc_path"; then
ifelse([$1],[],:,[$1])
else
ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2])
Modified: php/php-src/branches/PHP_5_3/configure.in
===================================================================
--- php/php-src/branches/PHP_5_3/configure.in 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/configure.in 2009-11-29 06:13:22 UTC (rev 291414)
@@ -1,9 +1,28 @@
## $Id$ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
-dnl AC 2.13 Compatibility
-PHP_DIVERT(1)
+divert(1)
+dnl ## Diversion 1 is the autoconf + automake setup phase. We also
+dnl ## set the PHP version, deal with platform-specific compile
+dnl ## options and check for the basic compile tools.
+
+dnl ## Diversion 2 is the initial checking of OS features, programs,
+dnl ## libraries and so on.
+
+dnl ## In diversion 3 we check for compile-time options to the PHP
+dnl ## core and how to deal with different system dependencies.
+dnl ## This includes whether debugging or short tags are enabled
+dnl ## and the default behaviour of php.ini options.
+dnl ## This is also where an SAPI interface is selected (choosing between
+dnl ## Apache module, CGI etc.)
+
+dnl ## In diversion 4 we check user-configurable general settings.
+
+dnl ## In diversion 5 we check which extensions should be compiled.
+dnl ## All of these are normally in the extension directories.
+dnl ## Diversion 5 is the last one. Here we generate files and clean up.
+
dnl include Zend specific macro definitions first
dnl -------------------------------------------------------------------------
sinclude(Zend/acinclude.m4)
@@ -13,9 +32,6 @@
AC_PREREQ(2.13)
AC_INIT(README.SVN-RULES)
-dnl For autoconf 2.60+ we use AC_PRESERVE_HELP_ORDER
-dnl instead of 2.13-style diversions
-ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
PHP_CONFIG_NICE(config.nice)
@@ -106,6 +122,21 @@
$php_shtool mkdir -p libs
rm -f libs/*
+dnl Darwin 9 hack
+dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5
+dnl causes errors in all current and past versions of Autoconf, we do a little
+dnl messing with the CFLAGS here to trick it.
+php_did_darwin9_cheat=0
+case $host_alias in
+*darwin9*)
+ hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'`
+ if test x"$hasg" = "x"; then
+ php_did_darwin9_cheat=1
+ CFLAGS="$CFLAGS -gstabs"
+ fi
+ ;;
+esac
+
dnl Checks for programs.
dnl -------------------------------------------------------------------------
@@ -273,9 +304,16 @@
sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
-dnl AC 2.13 Compatibility
-PHP_DIVERT(2)
+divert(2)
+
+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
+dnl ## because the information is needed by the SAPI configuration.
+dnl ## This is also where an SAPI interface is selected (choosing between
+dnl ## Apache module, CGI etc.)
+
+dnl .
dnl -------------------------------------------------------------------------
PTHREADS_CHECK
@@ -306,9 +344,13 @@
PTHREADS_FLAGS
fi
-dnl AC 2.13 Compatibility
-PHP_DIVERT(3)
+divert(3)
+dnl ## In diversion 3 we check for compile-time options to the PHP
+dnl ## core and how to deal with different system dependencies.
+dnl ## This includes whether debugging or short tags are enabled
+dnl ## and the default behaviour of php.ini options.
+
dnl Starting system checks.
dnl -------------------------------------------------------------------------
@@ -649,9 +691,10 @@
PHP_CRYPT_R_STYLE
fi
-dnl AC 2.13 Compatibility
-PHP_DIVERT(4)
+divert(4)
+dnl ## In diversion 4 we check user-configurable general settings.
+
dnl General settings.
dnl -------------------------------------------------------------------------
PHP_CONFIGURE_PART(General settings)
@@ -889,9 +932,11 @@
AC_MSG_RESULT([using system default])
fi
-dnl AC 2.13 Compatibility
-PHP_DIVERT(5)
+divert(5)
+dnl ## In diversion 5 we check which extensions should be compiled.
+dnl ## All of these are normally in the extension directories.
+
dnl Extension configuration.
dnl -------------------------------------------------------------------------
@@ -958,7 +1003,7 @@
EXTRA_LIBS="-lcrypt $EXTRA_LIBS -lcrypt"
fi
-#unset LIBS LDFLAGS
+unset LIBS LDFLAGS
dnl PEAR
dnl -------------------------------------------------------------------------
@@ -1041,7 +1086,7 @@
fi
ZEND_EXTRA_LIBS="$LIBS"
-#unset LIBS LDFLAGS
+unset LIBS LDFLAGS
PHP_HELP_SEPARATOR([TSRM:])
PHP_CONFIGURE_PART(Configuring TSRM)
@@ -1053,7 +1098,7 @@
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS"
EXTRA_LIBS="$EXTRA_LIBS $LIBS"
-#unset LIBS LDFLAGS
+unset LIBS LDFLAGS
test "$prefix" = "NONE" && prefix=/usr/local
test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
@@ -1317,6 +1362,15 @@
CC=$old_CC
+dnl Finish the Darwin hack
+if test "$php_did_darwin9_cheat" -eq 1; then
+ if test "$PHP_DEBUG" = "1"; then
+ CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs/-g/g'`
+ else
+ CFLAGS=`echo "-O2 $CFLAGS" | $SED -e 's/-gstabs//g'`
+ fi
+fi
+
PHP_CONFIGURE_PART(Generating files)
CXXFLAGS_CLEAN=$CXXFLAGS
Modified: php/php-src/branches/PHP_5_3/ext/pdo_dblib/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_dblib/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/ext/pdo_dblib/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -59,19 +59,19 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_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_cv_inc_path $PDO_DBLIB_DEFS)
+ PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, $ext_shared,,-I$pdo_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,[ ])
Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_firebird/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -50,7 +50,7 @@
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_cv_inc_path)
+ PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_inc_path)
PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD)
PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo)
fi
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -148,20 +148,20 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_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_cv_inc_path -I)
+ PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path -I)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_oci/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/ext/pdo_oci/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -199,18 +199,18 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($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_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_inc_path)
PHP_SUBST_OLD(PDO_OCI_SHARED_LIBADD)
PHP_SUBST_OLD(PDO_OCI_DIR)
Modified: php/php-src/branches/PHP_5_3/ext/pdo_odbc/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_odbc/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/ext/pdo_odbc/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -47,15 +47,15 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
AC_MSG_CHECKING([for selected PDO ODBC flavour])
@@ -165,7 +165,7 @@
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_cv_inc_path $PDO_ODBC_INCLUDE)
+ PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE)
PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
ifdef([PHP_ADD_EXTENSION_DEP],
[
Modified: php/php-src/branches/PHP_5_3/ext/pdo_pgsql/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_pgsql/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/ext/pdo_pgsql/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -109,18 +109,18 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
- PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_PGSQL_CFLAGS)
+ PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
Modified: php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -19,15 +19,15 @@
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$abs_srcdir/ext
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_cv_inc_path=$prefix/include/php/ext
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
- AC_MSG_RESULT($pdo_cv_inc_path)
+ AC_MSG_RESULT($pdo_inc_path)
])
php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
@@ -70,7 +70,7 @@
])
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
- PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_cv_inc_path)
+ PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_inc_path)
else
# use bundled libs
if test "$enable_maintainer_zts" = "yes"; then
@@ -92,7 +92,7 @@
PHP_NEW_EXTENSION(pdo_sqlite,
$php_pdo_sqlite_sources_core,
- $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_cv_inc_path)
+ $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path)
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3)
Modified: php/php-src/branches/PHP_5_3/ext/sqlite/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sqlite/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/ext/sqlite/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -48,9 +48,9 @@
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_cv_inc_path"; then
+ if test -n "$pdo_inc_path"; then
AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
- pdo_cv_inc_path="-I$pdo_cv_inc_path"
+ pdo_inc_path="-I$pdo_inc_path"
fi
fi
@@ -83,13 +83,13 @@
-L$SQLITE_DIR/$PHP_LIBDIR -lm
])
SQLITE_MODULE_TYPE=external
- PHP_SQLITE_CFLAGS=$pdo_cv_inc_path
+ PHP_SQLITE_CFLAGS=$pdo_inc_path
sqlite_extra_sources="libsqlite/src/encode.c"
else
# use bundled library
PHP_PROG_LEMON
SQLITE_MODULE_TYPE=builtin
- PHP_SQLITE_CFLAGS="-...@ext_srcdir@/libsqlite/src -...@ext_builddir@/libsqlite/src $pdo_cv_inc_path"
+ PHP_SQLITE_CFLAGS="-...@ext_srcdir@/libsqlite/src -...@ext_builddir@/libsqlite/src $pdo_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 \
Modified: php/php-src/branches/PHP_5_3/ext/standard/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -1,7 +1,6 @@
dnl $Id$ -*- autoconf -*-
-dnl AC 2.13 Compatibility
-PHP_DIVERT(3)
+divert(3)dnl
dnl
dnl Check if flush should be called explicitly after buffered io
@@ -221,8 +220,7 @@
AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
AC_FUNC_FNMATCH
-dnl AC 2.13 Compatibility
-PHP_DIVERT(5)
+divert(5)dnl
dnl
dnl Check if there is a support means of creating a new process
@@ -234,7 +232,6 @@
],[
php_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
AC_MSG_RESULT(yes)
Modified: php/php-src/trunk/configure.in
===================================================================
--- php/php-src/trunk/configure.in 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/trunk/configure.in 2009-11-29 06:13:22 UTC (rev 291414)
@@ -1,7 +1,8 @@
## $Id$ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
-divert(1001)
+dnl No longer needed after dropping support for autoconf 2.13
+dnl divert(1)
dnl ## Diversion 1 is the autoconf + automake setup phase. We also
dnl ## set the PHP version, deal with platform-specific compile
@@ -30,8 +31,9 @@
dnl Basic autoconf + automake initialization, generation of config.nice.
dnl -------------------------------------------------------------------------
-AC_PREREQ(2.13)
+AC_PREREQ(2.60)
AC_INIT(README.SVN-RULES)
+AC_PRESERVE_HELP_ORDER
PHP_CONFIG_NICE(config.nice)
@@ -305,7 +307,8 @@
sinclude(TSRM/tsrm.m4)
-divert(1002)
+dnl No longer needed after dropping support for autoconf 2.13
+dnl divert(2)
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 +347,8 @@
PTHREADS_FLAGS
fi
-divert(1003)
+dnl No longer needed after dropping support for autoconf 2.13
+dnl divert(3)
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 +695,8 @@
PHP_CRYPT_R_STYLE
fi
-divert(1004)
+dnl No longer needed after dropping support for autoconf 2.13
+dnl divert(4)
dnl ## In diversion 4 we check user-configurable general settings.
@@ -921,7 +926,8 @@
dnl ## check for ICU library location and version
PHP_SETUP_ICU
-divert(1005)
+dnl No longer needed after dropping support for autoconf 2.13
+dnl divert(5)
dnl ## In diversion 5 we check which extensions should be compiled.
dnl ## All of these are normally in the extension directories.
Modified: php/php-src/trunk/ext/standard/config.m4
===================================================================
--- php/php-src/trunk/ext/standard/config.m4 2009-11-29 04:38:46 UTC (rev 291413)
+++ php/php-src/trunk/ext/standard/config.m4 2009-11-29 06:13:22 UTC (rev 291414)
@@ -1,6 +1,7 @@
dnl $Id$ -*- autoconf -*-
-divert(1003)dnl
+dnl No longer needed after dropping support for autoconf 2.13
+dnl divert(3)
dnl
dnl Check if flush should be called explicitly after buffered io
@@ -220,7 +221,8 @@
AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
AC_FUNC_FNMATCH
-divert(1005)dnl
+dnl No longer needed after dropping support for autoconf 2.13
+dnl divert(5)
dnl
dnl Check if there is a support means of creating a new process
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
