diff --git a/config.m4 b/config.m4 index 62d27c0..4e851a2 100644 --- a/config.m4 +++ b/config.m4 @@ -150,6 +150,13 @@ if test "$PHP_PDO_OCI" != "no"; then PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) PHP_ADD_LIBPATH($PDO_OCI_LIB_DIR, PDO_OCI_SHARED_LIBADD) + PHP_CHECK_LIBRARY(clntsh, OCIEnvNlsCreate, + [ + AC_DEFINE(HAVE_OCIENVNLSCREATE,1,[ ]) + ], [], [ + -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD + ]) + PHP_CHECK_PDO_INCLUDES PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_cv_inc_path) diff --git a/oci_driver.c b/oci_driver.c index 7940c09..3026f7c 100644 --- a/oci_driver.c +++ b/oci_driver.c @@ -742,6 +742,7 @@ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ * H->prefetch = PDO_OCI_PREFETCH_DEFAULT; /* allocate an environment */ +#ifdef HAVE_OCIENVNLSCREATE if (vars[0].optval) { H->charset = OCINlsCharSetNameToId(pdo_oci_Env, (const oratext *)vars[0].optval); if (!H->charset) { @@ -754,7 +755,7 @@ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ * } } } - +#endif if (H->env == NULL) { /* use the global environment */ H->env = pdo_oci_Env;