cvs: php-src /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_odbc config.m4 /ext/pdo_pgsql config.m4
/ext/pdo_sqlite config.m4

rasmus Mon Feb 28 03:18:47 2005 EDT Modified files: /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: If pdo is disabled, skip all the pdo extensions. http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/config.m4?r1=1.5&r2=1.6&ty=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.5 php-src/ext/pdo_firebird/config.m4:1.6 --- php-src/ext/pdo_firebird/config.m4:1.5 Wed Feb 23 12:44:22 2005 +++ php-src/ext/pdo_firebird/config.m4 Mon Feb 28 03:18:46 2005 @@ -1,7 +1,9 @@ dnl -dnl $Id: config.m4,v 1.5 2005/02/23 17:44:22 abies Exp $ +dnl $Id: config.m4,v 1.6 2005/02/28 08:18:46 rasmus Exp $ dnl +if test "$PHP_PDO" != "no"; then + PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO, [ --with-pdo-firebird[=DIR] Include Firebird support for PDO. DIR is the Firebird base install directory, defaults to /opt/firebird]) @@ -57,3 +59,5 @@ PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo) fi + +fi http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.18&r2=1.19&ty=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.18 php-src/ext/pdo_mysql/config.m4:1.19 --- php-src/ext/pdo_mysql/config.m4:1.18 Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo_mysql/config.m4 Mon Feb 28 03:18:47 2005 @@ -1,7 +1,9 @@ dnl -dnl $Id: config.m4,v 1.18 2005/02/17 04:23:14 wez Exp $ +dnl $Id: config.m4,v 1.19 2005/02/28 08:18:47 rasmus Exp $ dnl +if test "$PHP_PDO" != "no"; then + AC_DEFUN([PDO_MYSQL_LIB_CHK], [ str="$PDO_MYSQL_DIR/$1/libmysqlclient.*" for j in echo $str; do @@ -81,3 +83,5 @@ PHP_SUBST_OLD(PDO_MYSQL_LIBS) PHP_SUBST_OLD(PDO_MYSQL_INCLUDE) fi + +fi http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.10&r2=1.11&ty=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.10 php-src/ext/pdo_oci/config.m4:1.11 --- php-src/ext/pdo_oci/config.m4:1.10 Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo_oci/config.m4 Mon Feb 28 03:18:47 2005 @@ -1,4 +1,6 @@ -dnl $Id: config.m4,v 1.10 2005/02/17 04:23:14 wez Exp $ +dnl $Id: config.m4,v 1.11 2005/02/28 08:18:47 rasmus Exp $ + +if test "$PHP_PDO" != "no"; then AC_DEFUN([AC_PDO_OCI_VERSION],[ AC_MSG_CHECKING([Oracle version]) @@ -180,3 +182,5 @@ PHP_ADD_EXTENSION_DEP(pdo_oci, pdo) fi + +fi http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/config.m4?r1=1.14&r2=1.15&ty=u Index: php-src/ext/pdo_odbc/config.m4 diff -u php-src/ext/pdo_odbc/config.m4:1.14 php-src/ext/pdo_odbc/config.m4:1.15 --- php-src/ext/pdo_odbc/config.m4:1.14 Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo_odbc/config.m4 Mon Feb 28 03:18:47 2005 @@ -1,7 +1,9 @@ -dnl $Id: config.m4,v 1.14 2005/02/17 04:23:14 wez Exp $ +dnl $Id: config.m4,v 1.15 2005/02/28 08:18:47 rasmus Exp $ dnl config.m4 for extension pdo_odbc dnl vim:et:sw=2:ts=2: +if test "$PHP_PDO" != "no"; then + AC_DEFUN([PDO_ODBC_HELP_TEXT], [[ --with-pdo-odbc=flavour,dir Add support for "flavour" ODBC drivers, looking for include and lib dirs under "dir" @@ -147,3 +149,4 @@ PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo) fi +fi http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/config.m4?r1=1.6&r2=1.7&ty=u Index: php-src/ext/pdo_pgsql/config.m4 diff -u php-src/ext/pdo_pgsql/config.m4:1.6 php-src/ext/pdo_pgsql/config.m4:1.7 --- php-src/ext/pdo_pgsql/config.m4:1.6 Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo_pgsql/config.m4 Mon Feb 28 03:18:47 2005 @@ -1,7 +1,9 @@ dnl -dnl $Id: config.m4,v 1.6 2005/02/17 04:23:14 wez Exp $ +dnl $Id: config.m4,v 1.7 2005/02/28 08:18:47 rasmus Exp $ dnl +if test "$PHP_PDO" != "no"; then + AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[ ]) @@ -112,3 +114,5 @@ 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) fi + +fi http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.11&r2=1.12&ty=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.11 php-src/ext/pdo_sqlite/config.m4:1.12 --- php-src/ext/pdo_sqlite/config.m4:1.11 Sun Feb 27 22:21:52 2005 +++ php-src/ext/pdo_sqlite/config.m4 Mon Feb 28 03:18:47 2005 @@ -1,7 +1,9 @@ -dnl $Id: config.m4,v 1.11 2005/02/28 03:21:52 wez Exp $ +dnl $Id: config.m4,v 1.12 2005/02/28 08:18:47 rasmus 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 driver for PDO, [ --with-pdo-sqlite Include PDO sqlite 3 support],yes) @@ -116,3 +118,5 @@ fi PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo) fi + +fi