Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

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.
PHP-5.2.1RC1
Rasmus Lerdorf 17 years ago
parent
50e31fe9c1
commit
42c4e5c148
9 changed files with 41 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      acinclude.m4
  2. 10
      ext/pdo_dblib/config.m4
  3. 2
      ext/pdo_firebird/config.m4
  4. 10
      ext/pdo_mysql/config.m4
  5. 10
      ext/pdo_oci/config.m4
  6. 10
      ext/pdo_odbc/config.m4
  7. 10
      ext/pdo_pgsql/config.m4
  8. 12
      ext/pdo_sqlite/config.m4
  9. 8
      ext/sqlite/config.m4

10
acinclude.m4
View File

@ -2736,17 +2736,17 @@ dnl
dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]]) dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
dnl dnl
AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[ 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]) AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 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 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 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 fi
]) ])
if test -n "$pdo_cv_inc_path"; then
if test -n "$pdo_inc_path"; then
ifelse([$1],[],:,[$1]) ifelse([$1],[],:,[$1])
else else
ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2]) ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2])

10
ext/pdo_dblib/config.m4
View File

@ -58,19 +58,19 @@ if test "$PHP_PDO_DBLIB" != "no"; then
],[ ],[
AC_MSG_CHECKING([for PDO includes]) AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 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 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 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 else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi fi
AC_MSG_RESULT($pdo_cv_inc_path)
AC_MSG_RESULT($pdo_inc_path)
]) ])
PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\"" 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, AC_CHECK_LIB(dnet_stub, dnet_addr,
[ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD) [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ]) AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])

2
ext/pdo_firebird/config.m4
View File

@ -45,7 +45,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD)
PHP_ADD_INCLUDE($FIREBIRD_INCDIR) PHP_ADD_INCLUDE($FIREBIRD_INCDIR)
AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ]) 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_SUBST(PDO_FIREBIRD_SHARED_LIBADD)
PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo) PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo)
fi fi

10
ext/pdo_mysql/config.m4
View File

@ -138,18 +138,18 @@ if test "$PHP_PDO_MYSQL" != "no"; then
],[ ],[
AC_MSG_CHECKING([for PDO includes]) AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 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 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 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 else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi 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], ifdef([PHP_ADD_EXTENSION_DEP],
[ [
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo) PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)

10
ext/pdo_oci/config.m4
View File

@ -230,18 +230,18 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
],[ ],[
AC_MSG_CHECKING([for PDO includes]) AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 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 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 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 else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi 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_SHARED_LIBADD)
PHP_SUBST_OLD(PDO_OCI_DIR) PHP_SUBST_OLD(PDO_OCI_DIR)

10
ext/pdo_odbc/config.m4
View File

@ -45,15 +45,15 @@ if test "$PHP_PDO_ODBC" != "no"; then
],[ ],[
AC_MSG_CHECKING([for PDO includes]) AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 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 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 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 else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi fi
AC_MSG_RESULT($pdo_cv_inc_path)
AC_MSG_RESULT($pdo_inc_path)
]) ])
AC_MSG_CHECKING([for selected PDO ODBC flavour]) AC_MSG_CHECKING([for selected PDO ODBC flavour])
@ -157,7 +157,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]) AC_MSG_ERROR([Your ODBC library does not exist or there was an error. Check config.log for more information])
], $PDO_ODBC_LDFLAGS) ], $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) PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
ifdef([PHP_ADD_EXTENSION_DEP], ifdef([PHP_ADD_EXTENSION_DEP],
[ [

10
ext/pdo_pgsql/config.m4
View File

@ -111,18 +111,18 @@ if test "$PHP_PDO_PGSQL" != "no"; then
],[ ],[
AC_MSG_CHECKING([for PDO includes]) AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 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 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 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 else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi 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], ifdef([PHP_ADD_EXTENSION_DEP],
[ [
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo) PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)

12
ext/pdo_sqlite/config.m4
View File

@ -17,15 +17,15 @@ if test "$PHP_PDO_SQLITE" != "no"; then
],[ ],[
AC_MSG_CHECKING([for PDO includes]) AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 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 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 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 else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi 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" php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
@ -68,7 +68,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
]) ])
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) 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 else
# use bundled libs # use bundled libs
pdo_sqlite_sources="sqlite/src/attach.c sqlite/src/auth.c sqlite/src/btree.c \ pdo_sqlite_sources="sqlite/src/attach.c sqlite/src/auth.c sqlite/src/btree.c \
@ -91,7 +91,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
PHP_NEW_EXTENSION(pdo_sqlite, PHP_NEW_EXTENSION(pdo_sqlite,
$php_pdo_sqlite_sources_core $pdo_sqlite_sources, $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_SUBST(PDO_SQLITE_SHARED_LIBADD)
PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1)

8
ext/sqlite/config.m4
View File

@ -48,9 +48,9 @@ AC_DEFUN([PHP_PROG_LEMON],[
if test "$PHP_SQLITE" != "no"; then if test "$PHP_SQLITE" != "no"; then
if test "$PHP_PDO" != "no"; then if test "$PHP_PDO" != "no"; then
PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])]) 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]) 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
fi fi
@ -83,13 +83,13 @@ if test "$PHP_SQLITE" != "no"; then
-L$SQLITE_DIR/$PHP_LIBDIR -lm -L$SQLITE_DIR/$PHP_LIBDIR -lm
]) ])
SQLITE_MODULE_TYPE=external SQLITE_MODULE_TYPE=external
PHP_SQLITE_CFLAGS=$pdo_cv_inc_path
PHP_SQLITE_CFLAGS=$pdo_inc_path
sqlite_extra_sources="libsqlite/src/encode.c" sqlite_extra_sources="libsqlite/src/encode.c"
else else
# use bundled library # use bundled library
PHP_PROG_LEMON PHP_PROG_LEMON
SQLITE_MODULE_TYPE=builtin SQLITE_MODULE_TYPE=builtin
PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_cv_inc_path"
PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path"
sqlite_extra_sources="libsqlite/src/opcodes.c \ sqlite_extra_sources="libsqlite/src/opcodes.c \
libsqlite/src/parse.c libsqlite/src/encode.c \ libsqlite/src/parse.c libsqlite/src/encode.c \
libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \

Write Preview
Loading…
Cancel
Save