MFH: allow building oci8 as shared

diff --git a/NEWS b/NEWS
index dec079d538a1542e0938e2e81127007a3e9e1985..ac553cf2e2941d7d9aec8b1409a7ed32d8ea5b41 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP                                                                        NEWS
 - Updated bundled oniguruma library (used for multibyte regular expression)
   to 3.7.0. (Moriyoshi)
 - Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
+- Fixed bug preventing from building oci8 as shared. 
+  (stanislav dot voroniy at portavita dot nl, Tony)
   Fixed bugs:
   . Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
   . Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index c1af08c1838f8065989dad311d5c6886c92e18f7..d3e7fc16a4b8dd7766f86171bc6a21b4efeffd5a 100644 (file)
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -64,13 +64,17 @@ PHP_ARG_WITH(oci8, for Oracle (OCI8) support using ORACLE_HOME installation,
 [  --with-oci8[=DIR]       Include Oracle (OCI8) support using an ORACLE_HOME
                           install. The default DIR is ORACLE_HOME])
 
-PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle Instant Client,
-[  --with-oci8-instant-client[=DIR]    
+if test "$PHP_OCI8" = "no"; then
+  PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle Instant Client,
+  [  --with-oci8-instant-client[=DIR]    
                           Include Oracle (OCI8) support using
                           Oracle Instant Client. DIR is the directory with the
                           Instant Client libraries. On Linux it will default to
                           /usr/lib/oracle/<most_recent_version>/client/lib
                           Other platforms will need to have it explicitly specified.])
+else 
+  PHP_OCI8_INSTANT_CLIENT="no";
+fi
 
 if test "$PHP_OCI8" != "no"; then