diff options
| author | Jani Taskinen <jani@php.net> | 2008-07-25 13:38:41 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2008-07-25 13:38:41 +0000 |
| commit | 3f73317c79691110aa3055fbe9c1df1b3bc30d54 (patch) | |
| tree | c9161e3a13ca73d97ebb8481d5317834f37b8db0 /ext/pdo_oci | |
| parent | e8741cc4fc31e09a6474ea9e0da70a2592d2e2f9 (diff) | |
| download | php-git-3f73317c79691110aa3055fbe9c1df1b3bc30d54.tar.gz | |
- Fix PDO configure dependancy: If --disable-pdo is used, disable all enabled-by-default drivers. Also error out if you try to configure a driver as static but pdo is disabled.
Diffstat (limited to 'ext/pdo_oci')
| -rwxr-xr-x | ext/pdo_oci/config.m4 | 11 |
1 files changed, 7 insertions, 4 deletions
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 |