From: Rasmus Lerdorf Date: Mon, 28 Feb 2005 08:18:47 +0000 (+0000) Subject: If pdo is disabled, skip all the pdo extensions. X-Git-Tag: RELEASE_0_3~133 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99f832a206a7fcc3665a4734a3924a6f7efef1d8;p=php If pdo is disabled, skip all the pdo extensions. --- diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4 index e09b30c354..31e79c5e24 100644 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@ -2,6 +2,8 @@ dnl dnl $Id$ 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 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo) fi + +fi diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index 860f10db0e..7f12588c07 100755 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -2,6 +2,8 @@ dnl dnl $Id$ 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 @@ Note that the MySQL client library is not bundled anymore.]) PHP_SUBST_OLD(PDO_MYSQL_LIBS) PHP_SUBST_OLD(PDO_MYSQL_INCLUDE) fi + +fi diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index a3d260e6c0..aaef5d6d57 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -1,5 +1,7 @@ dnl $Id$ +if test "$PHP_PDO" != "no"; then + AC_DEFUN([AC_PDO_OCI_VERSION],[ AC_MSG_CHECKING([Oracle version]) if test -s "$PDO_OCI_DIR/orainst/unix.rgs"; then @@ -180,3 +182,5 @@ You need to tell me where to find your oracle SDK, or set ORACLE_HOME. PHP_ADD_EXTENSION_DEP(pdo_oci, pdo) fi + +fi diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4 index bddd7dcd6e..c7bb43e5df 100755 --- a/ext/pdo_odbc/config.m4 +++ b/ext/pdo_odbc/config.m4 @@ -2,6 +2,8 @@ dnl $Id$ 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 @@ functions required for PDO support. PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo) fi +fi diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4 index 8ab436a62f..569f748204 100644 --- a/ext/pdo_pgsql/config.m4 +++ b/ext/pdo_pgsql/config.m4 @@ -2,6 +2,8 @@ dnl dnl $Id$ dnl +if test "$PHP_PDO" != "no"; then + AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[ ]) @@ -112,3 +114,5 @@ if test "$PHP_PDO_PGSQL" != "no"; then 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 diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 8cc157fd0c..d585f771e2 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -2,6 +2,8 @@ dnl $Id$ 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 @@ EOF fi PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo) fi + +fi