jani Fri Jul 25 13:46:24 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo config.m4 /php-src/ext/pdo_dblib config.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: MFH: Fix PDO configure dependancy: If --disable-pdo is used, disable all MFH: enabled-by-default drivers. Also error out if you try to configure MFH: a driver as static but pdo is disabled.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/config.m4?r1=1.15.2.3.2.1&r2=1.15.2.3.2.1.2.1&diff_format=u Index: php-src/ext/pdo/config.m4 diff -u php-src/ext/pdo/config.m4:1.15.2.3.2.1 php-src/ext/pdo/config.m4:1.15.2.3.2.1.2.1 --- php-src/ext/pdo/config.m4:1.15.2.3.2.1 Thu Aug 24 16:00:43 2006 +++ php-src/ext/pdo/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15.2.3.2.1 2006/08/24 16:00:43 tony2001 Exp $ +dnl $Id: config.m4,v 1.15.2.3.2.1.2.1 2008/07/25 13:46:23 jani Exp $ dnl config.m4 for extension pdo dnl vim:se ts=2 sw=2 et: @@ -32,6 +32,9 @@ if test "$PHP_PDO" != "no"; then + dnl Make sure $PHP_PDO is 'yes' when it's not 'no' :) + PHP_PDO=yes + PHP_PDO_PEAR_CHECK if test "$ext_shared" = "yes" ; then http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/config.m4?r1=1.2.2.2.2.1&r2=1.2.2.2.2.1.2.1&diff_format=u Index: php-src/ext/pdo_dblib/config.m4 diff -u php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1 php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1.2.1 --- php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1 Tue Jul 3 17:25:34 2007 +++ php-src/ext/pdo_dblib/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,15 +1,16 @@ dnl -dnl $Id: config.m4,v 1.2.2.2.2.1 2007/07/03 17:25:34 sniper Exp $ +dnl $Id: config.m4,v 1.2.2.2.2.1.2.1 2008/07/25 13:46:23 jani Exp $ dnl -if test "$PHP_PDO" != "no"; then PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS, -[ --with-pdo-dblib[=DIR] PDO: DBLIB-DB support. DIR is the FreeTDS home - directory]) - +[ --with-pdo-dblib[=DIR] PDO: DBLIB-DB support. DIR is the FreeTDS home directory]) if test "$PHP_PDO_DBLIB" != "no"; then + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then + AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + if test "$PHP_PDO_DBLIB" = "yes"; then for i in /usr/local /usr; do @@ -84,5 +85,3 @@ PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo) ]) fi - -fi http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.8.4.2&r2=1.8.4.2.2.1&diff_format=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.8.4.2 php-src/ext/pdo_firebird/config.m4:1.8.4.2.2.1 --- php-src/ext/pdo_firebird/config.m4:1.8.4.2 Tue Jul 31 13:02:00 2007 +++ php-src/ext/pdo_firebird/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,14 +1,17 @@ dnl -dnl $Id: config.m4,v 1.8.4.2 2007/07/31 13:02:00 jani Exp $ +dnl $Id: config.m4,v 1.8.4.2.2.1 2008/07/25 13:46:23 jani Exp $ dnl -if test "$PHP_PDO" != "no"; then - PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO, [ --with-pdo-firebird[=DIR] PDO: Firebird support. DIR is the Firebird base install directory [/opt/firebird]]) if test "$PHP_PDO_FIREBIRD" != "no"; then + + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then + AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + if test "$PHP_PDO_FIREBIRD" = "yes"; then FIREBIRD_INCDIR=/opt/firebird/include FIREBIRD_LIBDIR=/opt/firebird/lib @@ -49,5 +52,3 @@ PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo) fi - -fi http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.7.2.6.2.2&r2=1.25.2.7.2.6.2.3&diff_format=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6.2.2 php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6.2.3 --- php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6.2.2 Mon Jul 21 13:09:27 2008 +++ php-src/ext/pdo_mysql/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,6 +1,6 @@ -dnl -dnl $Id: config.m4,v 1.25.2.7.2.6.2.2 2008/07/21 13:09:27 johannes Exp $ -dnl +dnl $Id: config.m4,v 1.25.2.7.2.6.2.3 2008/07/25 13:46:23 jani Exp $ ++ dnl config.m4 for extension pdo_mysql ++ dnl vim: se ts=2 sw=2 et: PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO, [ --with-pdo-mysql[=DIR] PDO: MySQL support. DIR is the MySQL base directoy @@ -13,6 +13,11 @@ fi if test "$PHP_PDO_MYSQL" != "no"; then + + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then + AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + PHP_MYSQLND_ENABLED=yes AC_DEFUN([PDO_MYSQL_LIB_CHK], [ @@ -170,5 +175,3 @@ PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE) fi - -dnl vim: se ts=2 sw=2 et: http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.m4?r1=1.14.2.5.2.6&r2=1.14.2.5.2.6.2.1&diff_format=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.14.2.5.2.6 php-src/ext/pdo_oci/config.m4:1.14.2.5.2.6.2.1 --- php-src/ext/pdo_oci/config.m4:1.14.2.5.2.6 Fri Aug 31 21:08:48 2007 +++ php-src/ext/pdo_oci/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,6 +1,6 @@ -dnl $Id: config.m4,v 1.14.2.5.2.6 2007/08/31 21:08:48 sixd Exp $ - -if test "$PHP_PDO" != "no"; then +dnl $Id: config.m4,v 1.14.2.5.2.6.2.1 2008/07/25 13:46:23 jani Exp $ +dnl config.m4 for extension pdo_oci +dnl vim:et:sw=2:ts=2: AC_DEFUN([AC_PDO_OCI_VERSION],[ AC_MSG_CHECKING([Oracle version]) @@ -61,6 +61,11 @@ --with-pdo-oci=instantclient,/usr,10.2.0.3]) if test "$PHP_PDO_OCI" != "no"; then + + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then + AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + AC_MSG_CHECKING([Oracle Install-Dir]) if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then PDO_OCI_DIR=$ORACLE_HOME @@ -254,5 +259,3 @@ AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ]) fi - -fi http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/config.m4?r1=1.22.2.1.2.3.2.1&r2=1.22.2.1.2.3.2.2&diff_format=u Index: php-src/ext/pdo_odbc/config.m4 diff -u php-src/ext/pdo_odbc/config.m4:1.22.2.1.2.3.2.1 php-src/ext/pdo_odbc/config.m4:1.22.2.1.2.3.2.2 --- php-src/ext/pdo_odbc/config.m4:1.22.2.1.2.3.2.1 Mon Oct 8 17:55:40 2007 +++ php-src/ext/pdo_odbc/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,9 +1,7 @@ -dnl $Id: config.m4,v 1.22.2.1.2.3.2.1 2007/10/08 17:55:40 wez Exp $ +dnl $Id: config.m4,v 1.22.2.1.2.3.2.2 2008/07/25 13:46:23 jani Exp $ dnl config.m4 for extension pdo_odbc dnl vim:et:sw=2:ts=2: -if test "$PHP_PDO" != "no"; then - define([PDO_ODBC_HELP_TEXT],[[ include and lib dirs are looked for under 'dir'. @@ -39,6 +37,10 @@ if test "$PHP_PDO_ODBC" != "no"; then + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then + AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + ifdef([PHP_CHECK_PDO_INCLUDES], [ PHP_CHECK_PDO_INCLUDES @@ -170,5 +172,3 @@ PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo) ]) fi - -fi http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.m4?r1=1.13.4.6&r2=1.13.4.6.2.1&diff_format=u Index: php-src/ext/pdo_pgsql/config.m4 diff -u php-src/ext/pdo_pgsql/config.m4:1.13.4.6 php-src/ext/pdo_pgsql/config.m4:1.13.4.6.2.1 --- php-src/ext/pdo_pgsql/config.m4:1.13.4.6 Tue Jul 31 13:02:00 2007 +++ php-src/ext/pdo_pgsql/config.m4 Fri Jul 25 13:46:24 2008 @@ -1,14 +1,17 @@ -dnl -dnl $Id: config.m4,v 1.13.4.6 2007/07/31 13:02:00 jani Exp $ -dnl - -if test "$PHP_PDO" != "no"; then +dnl $Id: config.m4,v 1.13.4.6.2.1 2008/07/25 13:46:24 jani Exp $ +dnl config.m4 for extension pdo_pgsql +dnl vim:et:sw=2:ts=2: PHP_ARG_WITH(pdo-pgsql,for PostgreSQL support for PDO, [ --with-pdo-pgsql[=DIR] PDO: PostgreSQL support. DIR is the PostgreSQL base install directory or the path to pg_config]) if test "$PHP_PDO_PGSQL" != "no"; then + + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then + AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + PHP_EXPAND_PATH($PGSQL_INCLUDE, PGSQL_INCLUDE) AC_MSG_CHECKING(for pg_config) @@ -128,5 +131,3 @@ PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo) ]) fi - -fi http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.7.2.3&r2=1.26.2.9.2.7.2.4&diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.3 php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.4 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.3 Thu Jul 24 14:25:33 2008 +++ php-src/ext/pdo_sqlite/config.m4 Fri Jul 25 13:46:24 2008 @@ -1,16 +1,18 @@ -dnl $Id: config.m4,v 1.26.2.9.2.7.2.3 2008/07/24 14:25:33 scottmac Exp $ +dnl $Id: config.m4,v 1.26.2.9.2.7.2.4 2008/07/25 13:46:24 jani Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: -if test "$PHP_PDO" != "no"; then - PHP_ARG_WITH(pdo-sqlite, for sqlite 3 support for PDO, [ --without-pdo-sqlite[=DIR] PDO: sqlite 3 support. DIR is the sqlite base - install directory [BUNDLED]], yes) + install directory [BUNDLED]], $PHP_PDO) if test "$PHP_PDO_SQLITE" != "no"; then + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then + AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + ifdef([PHP_CHECK_PDO_INCLUDES], [ PHP_CHECK_PDO_INCLUDES @@ -98,5 +100,3 @@ PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo) ]) fi - -fi
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php