mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Cache the pdo include path
This commit is contained in:
parent
24be7e2106
commit
78a15091f9
10
acinclude.m4
10
acinclude.m4
@ -2745,17 +2745,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])
|
||||
|
@ -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,[ ])
|
||||
|
@ -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
|
||||
|
@ -141,15 +141,15 @@ 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)
|
||||
])
|
||||
|
||||
if test -n "$PDO_MYSQL_CONFIG"; then
|
||||
@ -158,7 +158,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
|
||||
fi
|
||||
|
||||
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)
|
||||
|
@ -214,18 +214,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)
|
||||
|
@ -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],
|
||||
[
|
||||
|
@ -110,18 +110,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)
|
||||
|
@ -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)
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user