tony2001 Fri Feb 25 06:32:01 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/oci8 config.m4
Log:
MFH: allow building oci8 as shared
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.262&r2=1.1760.2.263&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.262 php-src/NEWS:1.1760.2.263
--- php-src/NEWS:1.1760.2.262 Thu Feb 24 18:59:50 2005
+++ php-src/NEWS Fri Feb 25 06:31:59 2005
@@ -9,6 +9,8 @@
- 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)
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.50.2.2&r2=1.50.2.3&ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.50.2.2 php-src/ext/oci8/config.m4:1.50.2.3
--- php-src/ext/oci8/config.m4:1.50.2.2 Thu Dec 30 02:04:11 2004
+++ php-src/ext/oci8/config.m4 Fri Feb 25 06:32:01 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.50.2.2 2004/12/30 07:04:11 sniper Exp $
+dnl $Id: config.m4,v 1.50.2.3 2005/02/25 11:32:01 tony2001 Exp $
dnl
AC_DEFUN([PHP_OCI_IF_DEFINED],[
@@ -64,13 +64,17 @@
[ --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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
