diff options
| author | Christopher Jones <sixd@php.net> | 2009-03-09 17:42:22 +0000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2009-03-09 17:42:22 +0000 |
| commit | 8ae20045c7ab2f5b273bcaefd1a43029bd6406b7 (patch) | |
| tree | 7934c97cd75de9c2db1915f5959f354d1ffffa8a /ext/oci8/config.m4 | |
| parent | 3896684ca01eee4cb1221ec55170351212d81e16 (diff) | |
| download | php-git-8ae20045c7ab2f5b273bcaefd1a43029bd6406b7.tar.gz | |
MFH: Bug #46623 (phpinfo doesn't show compile time ORACLE_HOME with phpize)
Diffstat (limited to 'ext/oci8/config.m4')
| -rw-r--r-- | ext/oci8/config.m4 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 6fcfc81938..3d0f3ad3eb 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -169,6 +169,8 @@ fi if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then +dnl Using an ORACLE_HOME install + AC_MSG_CHECKING([Oracle Install Directory]) if test "$PHP_OCI8" = "yes"; then OCI8_DIR=$ORACLE_HOME @@ -239,8 +241,14 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then PHP_SUBST_OLD(OCI8_DIR) PHP_SUBST_OLD(OCI8_ORACLE_VERSION) +dnl Fix bug #46623 + AC_DEFINE_UNQUOTED(PHP_OCI8_DEF_DIR, "$OCI8_DIR", [ ]) + AC_DEFINE_UNQUOTED(PHP_OCI8_DEF_SHARED_LIBADD, "$OCI8_SHARED_LIBADD", [ ]) + elif test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then +dnl Using an Oracle Instant Client directory + AC_CHECK_SIZEOF(long int, 4) LIBDIR_SUFFIX="" if test "$ac_cv_sizeof_long_int" = "8" ; then @@ -315,5 +323,5 @@ dnl Header directory for manual installation PHP_SUBST_OLD(OCI8_SHARED_LIBADD) PHP_SUBST_OLD(OCI8_DIR) PHP_SUBST_OLD(OCI8_ORACLE_VERSION) - + fi |