sniper Mon Jun 13 20:00:53 2005 EDT
Modified files:
/php-src acinclude.m4
/php-src/ext/pdo_firebird config.m4
/php-src/ext/pdo_mysql config.m4
/php-src/ext/pdo_oci config.m4
/php-src/ext/pdo_odbc config.m4
/php-src/ext/pdo_pgsql config.m4
/php-src/ext/pdo_sqlite config.m4
Log:
- Added PHP_CHECK_PDO_INCLUDES macro (caches the result)
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.316&r2=1.317&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.316 php-src/acinclude.m4:1.317
--- php-src/acinclude.m4:1.316 Mon Jun 13 04:44:47 2005
+++ php-src/acinclude.m4 Mon Jun 13 20:00:51 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.316 2005/06/13 08:44:47 sniper Exp $
+dnl $Id: acinclude.m4,v 1.317 2005/06/14 00:00:51 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -2469,3 +2469,21 @@
AC_MSG_CHECKING([which regex library to use])
AC_MSG_RESULT([$REGEX_TYPE])
])
+
+dnl
+dnl PHP_CHECK_PDO_INCLUDES
+dnl
+AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
+ 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_inc_path=$abs_srcdir/ext
+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+ pdo_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
+ else
+ AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
+ fi
+ ])
+])
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/config.m4?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.7
php-src/ext/pdo_firebird/config.m4:1.8
--- php-src/ext/pdo_firebird/config.m4:1.7 Sun May 29 19:16:43 2005
+++ php-src/ext/pdo_firebird/config.m4 Mon Jun 13 20:00:52 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.7 2005/05/29 23:16:43 sniper Exp $
+dnl $Id: config.m4,v 1.8 2005/06/14 00:00:52 sniper Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -40,18 +40,8 @@
-L$FIREBIRD_LIBDIR
])
- 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
- elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_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
- else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
- fi
- AC_MSG_RESULT($pdo_inc_path)
-
+ PHP_CHECK_PDO_INCLUDES
+
PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR,
PDO_FIREBIRD_SHARED_LIBADD)
PHP_ADD_INCLUDE($FIREBIRD_INCDIR)
AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ])
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.21&r2=1.22&ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.21
php-src/ext/pdo_mysql/config.m4:1.22
--- php-src/ext/pdo_mysql/config.m4:1.21 Mon Jun 13 19:37:20 2005
+++ php-src/ext/pdo_mysql/config.m4 Mon Jun 13 20:00:53 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.21 2005/06/13 23:37:20 sniper Exp $
+dnl $Id: config.m4,v 1.22 2005/06/14 00:00:53 sniper Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -61,17 +61,7 @@
AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare])
LDFLAGS=$_SAVE_LDFLAGS
- 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
- elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_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
- else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
- fi
- AC_MSG_RESULT($pdo_inc_path)
+ PHP_CHECK_PDO_INCLUDES
PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c,
$ext_shared,,-I$pdo_inc_path)
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.12&r2=1.13&ty=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.12 php-src/ext/pdo_oci/config.m4:1.13
--- php-src/ext/pdo_oci/config.m4:1.12 Sun May 29 19:16:43 2005
+++ php-src/ext/pdo_oci/config.m4 Mon Jun 13 20:00:53 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.12 2005/05/29 23:16:43 sniper Exp $
+dnl $Id: config.m4,v 1.13 2005/06/14 00:00:53 sniper Exp $
if test "$PHP_PDO" != "no"; then
@@ -160,17 +160,7 @@
-L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
])
- 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
- elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_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
- else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
- fi
- AC_MSG_RESULT($pdo_inc_path)
+ PHP_CHECK_PDO_INCLUDES
PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c,
$ext_shared,,-I$pdo_inc_path)
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/config.m4?r1=1.17&r2=1.18&ty=u
Index: php-src/ext/pdo_odbc/config.m4
diff -u php-src/ext/pdo_odbc/config.m4:1.17 php-src/ext/pdo_odbc/config.m4:1.18
--- php-src/ext/pdo_odbc/config.m4:1.17 Sat Jun 11 09:27:50 2005
+++ php-src/ext/pdo_odbc/config.m4 Mon Jun 13 20:00:53 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.17 2005/06/11 13:27:50 wez Exp $
+dnl $Id: config.m4,v 1.18 2005/06/14 00:00:53 sniper Exp $
dnl config.m4 for extension pdo_odbc
dnl vim:et:sw=2:ts=2:
@@ -30,11 +30,11 @@
if test "$PHP_PDO_ODBC" != "no"; then
AC_MSG_CHECKING([for selected PDO ODBC flavour])
- pdo_odbc_flavour=`echo $PHP_PDO_ODBC | cut -d, -f1`
- pdo_odbc_dir=`echo $PHP_PDO_ODBC | cut -d, -f2`
+ pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
+ pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
if test "$pdo_odbc_dir" = "$PHP_PDO_ODBC" ; then
- pdo_odbc_dir=""
+ pdo_odbc_dir=
fi
case $pdo_odbc_flavour in
@@ -44,21 +44,21 @@
pdo_odbc_def_lib=-ldb2
;;
- unixODBC)
+ unixODBC|unixodbc)
pdo_odbc_def_libdir=/usr/local/lib
pdo_odbc_def_incdir=/usr/local/include
pdo_odbc_def_lib=-lodbc
;;
- ODBCRouter)
+ ODBCRouter|odbcrouter)
pdo_odbc_def_libdir=/usr/lib
pdo_odbc_def_incdir=/usr/include
pdo_odbc_def_lib=-lodbcsdk
;;
generic)
- pdo_odbc_def_lib="`echo $withval | cut -d, -f3`"
- pdo_odbc_def_cflags="`echo $withval | cut -d, -f4`"
+ pdo_odbc_def_lib="`echo $PHP_PDO_ODBC | cut -d, -f3`"
+ pdo_odbc_def_cflags="`echo $PHP_PDO_ODBC | cut -d, -f4`"
pdo_odbc_flavour="$pdo_odbc_flavour ($pdo_odbc_def_lib)"
;;
@@ -67,7 +67,7 @@
;;
esac
- if test "$pdo_odbc_dir" != "" ; then
+ if test -n "$pdo_odbc_dir"; then
PDO_ODBC_INCDIR="$pdo_odbc_dir/include"
PDO_ODBC_LIBDIR="$pdo_odbc_dir/lib"
else
@@ -127,17 +127,7 @@
PHP_EVAL_LIBLINE($PDO_ODBC_LIBS $PDO_ODBC_LFLAGS, [PDO_ODBC_SHARED_LIBADD])
PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
- 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
- elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_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
- else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
- fi
- AC_MSG_RESULT($pdo_inc_path)
+ PHP_CHECK_PDO_INCLUDES
PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c,
$ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE)
PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/config.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/pdo_pgsql/config.m4
diff -u php-src/ext/pdo_pgsql/config.m4:1.9 php-src/ext/pdo_pgsql/config.m4:1.10
--- php-src/ext/pdo_pgsql/config.m4:1.9 Sun May 29 19:16:43 2005
+++ php-src/ext/pdo_pgsql/config.m4 Mon Jun 13 20:00:53 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.9 2005/05/29 23:16:43 sniper Exp $
+dnl $Id: config.m4,v 1.10 2005/06/14 00:00:53 sniper Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -100,17 +100,7 @@
PHP_ADD_INCLUDE($PGSQL_INCLUDE)
- 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
- elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_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
- else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
- fi
- AC_MSG_RESULT($pdo_inc_path)
+ PHP_CHECK_PDO_INCLUDES
PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c,
$ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS)
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.20&r2=1.21&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.20
php-src/ext/pdo_sqlite/config.m4:1.21
--- php-src/ext/pdo_sqlite/config.m4:1.20 Sun May 29 19:16:43 2005
+++ php-src/ext/pdo_sqlite/config.m4 Mon Jun 13 20:00:53 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.20 2005/05/29 23:16:43 sniper Exp $
+dnl $Id: config.m4,v 1.21 2005/06/14 00:00:53 sniper Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -9,17 +9,7 @@
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
- elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_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
- else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
- fi
- AC_MSG_RESULT($pdo_inc_path)
+ PHP_CHECK_PDO_INCLUDES
php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
