From 904559135307289b8fb313bd9e4cb17ba2022d7d Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 25 Feb 2005 11:32:01 +0000 Subject: [PATCH] MFH: allow building oci8 as shared --- NEWS | 2 ++ ext/oci8/config.m4 | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index dec079d538..ac553cf2e2 100644 --- 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 c1af08c183..d3e7fc16a4 100644 --- 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//client/lib Other platforms will need to have it explicitly specified.]) +else + PHP_OCI8_INSTANT_CLIENT="no"; +fi if test "$PHP_OCI8" != "no"; then -- 2.50.1