tony2001 Fri Feb 25 06:33:25 2005 EDT
Modified files: (Branch: PHP_4_3)
/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.1247.2.843&r2=1.1247.2.844&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.843 php-src/NEWS:1.1247.2.844
--- php-src/NEWS:1.1247.2.843 Tue Feb 22 10:00:48 2005
+++ php-src/NEWS Fri Feb 25 06:33:23 2005
@@ -152,6 +152,8 @@
- Updated PCRE to provide better error handling in certain cases. (Andrei)
- NSAPI: added "bucket" parameter to list of non-php.ini-keys of php4_execute
for doing performance stats without warnings in server-log. (Uwe Schindler)
+- Fixed bug preventing from building oci8 as shared.
+ (stanislav dot voroniy at portavita dot nl, Tony)
- Fixed leap year checking with idate(). (Christian Schneider, Derick)
- Fixed strip_tags() to correctly handle '\0' characters. (Stefan)
- Fixed funny forking effect in FastCGI when PHP_FCGI_CHILDREN was not set.
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.37.2.11&r2=1.37.2.12&ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.37.2.11
php-src/ext/oci8/config.m4:1.37.2.12
--- php-src/ext/oci8/config.m4:1.37.2.11 Thu Dec 30 02:02:18 2004
+++ php-src/ext/oci8/config.m4 Fri Feb 25 06:33:24 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.37.2.11 2004/12/30 07:02:18 sniper Exp $
+dnl $Id: config.m4,v 1.37.2.12 2005/02/25 11:33:24 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
