diff options
| author | foobar <sniper@php.net> | 2003-03-24 10:18:00 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-03-24 10:18:00 +0000 |
| commit | 0b4784d951d0fac452334cda6732312edff7a46e (patch) | |
| tree | abba1344c14d6979fbf4db5c2c296c0d2033ce5e /ext/oci8/config.m4 | |
| parent | e43e219e468deb08fdd76e634e1ce2fcaf11fb36 (diff) | |
| download | php-git-0b4784d951d0fac452334cda6732312edff7a46e.tar.gz | |
Fixed bug #18640 properly
Diffstat (limited to 'ext/oci8/config.m4')
| -rw-r--r-- | ext/oci8/config.m4 | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 38984ccb88..ec4e7c45af 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -88,14 +88,7 @@ if test "$PHP_OCI8" != "no"; then 8.1) PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) - -dnl This breaks build on some systems (AIX at least). -dnl if test -f $OCI8_DIR/lib/libocijdbc8.so ; then -dnl PHP_ADD_LIBRARY(ocijdbc8, 1, OCI8_SHARED_LIBADD) -dnl fi - PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) - AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ]) dnl @@ -106,14 +99,7 @@ dnl fi 9.0) PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) - -dnl This breaks build on some systems (AIX at least) -dnl if test -f $OCI8_DIR/lib/libocijdbc8.so ; then -dnl PHP_ADD_LIBRARY(ocijdbc8, 1, OCI8_SHARED_LIBADD) -dnl fi - PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) - AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ]) AC_DEFINE(HAVE_OCI9,1,[ ]) @@ -124,6 +110,25 @@ dnl fi ;; esac + dnl + dnl Check if we need to add -locijdbc8 + dnl + PHP_CHECK_LIBRARY(clntsh, OCILobIsTemporary, + [ + AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) + ], [ + unset ac_cv_func_ocilobistemporary + PHP_CHECK_LIBRARY(ocijdbc8, OCILobIsTemporary, + [ + PHP_ADD_LIBRARY(ocijdbc8, 1, OCI8_SHARED_LIBADD) + AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) + ], [], [ + $OCI8_SHARED_LIBADD + ]) + ], [ + $OCI8_SHARED_LIBADD + ]) + PHP_NEW_EXTENSION(oci8, oci8.c, $ext_shared) AC_DEFINE(HAVE_OCI8,1,[ ]) |