diff options
| -rwxr-xr-x | ext/pdo/config.m4 | 3 | ||||
| -rw-r--r-- | ext/pdo_dblib/config.m4 | 10 | ||||
| -rw-r--r-- | ext/pdo_firebird/config.m4 | 9 | ||||
| -rwxr-xr-x | ext/pdo_mysql/config.m4 | 11 | ||||
| -rwxr-xr-x | ext/pdo_oci/config.m4 | 11 | ||||
| -rwxr-xr-x | ext/pdo_odbc/config.m4 | 8 | ||||
| -rw-r--r-- | ext/pdo_pgsql/config.m4 | 13 | ||||
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 10 |
8 files changed, 43 insertions, 32 deletions
diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4 index e61cbe428e..0bb055350d 100755 --- a/ext/pdo/config.m4 +++ b/ext/pdo/config.m4 @@ -32,6 +32,9 @@ PHP_ARG_ENABLE(pdo, whether to enable PDO support, 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 diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4 index ac36d050b5..f2600b2396 100644 --- a/ext/pdo_dblib/config.m4 +++ b/ext/pdo_dblib/config.m4 @@ -2,13 +2,15 @@ dnl dnl $Id$ 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 + PDO_FREETDS_INSTALLATION_DIR="" if test "$PHP_PDO_DBLIB" = "yes"; then @@ -77,5 +79,3 @@ if test "$PHP_PDO_DBLIB" != "no"; then PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo) ]) fi - -fi diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4 index 0df50f9611..42cc4fc5a1 100644 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@ -2,13 +2,16 @@ dnl dnl $Id$ 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 @@ 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 99f9491a2a..0457ae77bd 100755 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -1,6 +1,6 @@ -dnl dnl $Id$ -dnl +dnl config.m4 for extension pdo_mysql +dnl vim: se ts=2 sw=2 et: dnl TODO Rename when moving to pdo_mysql PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO, @@ -14,6 +14,11 @@ if test -z "$PHP_ZLIB_DIR"; then 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], [ @@ -171,5 +176,3 @@ if test "$PHP_PDO_MYSQL" != "no"; then PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE) fi - -dnl vim: se ts=2 sw=2 et: diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index 0e82c4e3b2..8c2960f924 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -1,6 +1,6 @@ dnl $Id$ - -if test "$PHP_PDO" != "no"; then +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 @@ PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO, --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 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_ AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ]) fi - -fi diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4 index 3aed6c5213..ce23e45d42 100755 --- a/ext/pdo_odbc/config.m4 +++ b/ext/pdo_odbc/config.m4 @@ -2,8 +2,6 @@ dnl $Id$ 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 @@ AC_DEFUN([PDO_ODBC_CHECK_HEADER],[ 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 @@ -164,5 +166,3 @@ 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 3abaf1306a..8d480a32b8 100644 --- a/ext/pdo_pgsql/config.m4 +++ b/ext/pdo_pgsql/config.m4 @@ -1,14 +1,17 @@ -dnl dnl $Id$ -dnl - -if test "$PHP_PDO" != "no"; then +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 @@ if test "$PHP_PDO_PGSQL" != "no"; then PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo) ]) fi - -fi diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 915c783c13..b85dce7834 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -2,15 +2,17 @@ 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 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 @@ if test "$PHP_PDO_SQLITE" != "no"; then PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo) ]) fi - -fi |