tony2001 Tue Nov 13 11:09:42 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8 config.m4 Log: MFH: remove Oracle8 support http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.11&r2=1.55.2.3.2.11.2.1&diff_format=u Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.11 php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.1 --- php-src/ext/oci8/config.m4:1.55.2.3.2.11 Tue Aug 14 12:15:04 2007 +++ php-src/ext/oci8/config.m4 Tue Nov 13 11:09:42 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.55.2.3.2.11 2007/08/14 12:15:04 tony2001 Exp $ +dnl $Id: config.m4,v 1.55.2.3.2.11.2.1 2007/11/13 11:09:42 tony2001 Exp $ dnl if test -z "$SED"; then @@ -202,48 +202,11 @@ case $OCI8_VERSION in 8.0) - PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, "", OCI8_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(core4, "", OCI8_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(psa, "", OCI8_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) - - PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate, - [ - AC_DEFINE(HAVE_OCI_ENV_CREATE,1,[ ]) - ], [], [ - -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD - ]) - - PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2, - [ - AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ]) - ], [], [ - -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD - ]) + AC_MSG_ERROR([Oracle client libraries < 9.0 are not supported any more. Please consider upgrading.]) ;; 8.1) - PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) - PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) - - PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate, - [ - AC_DEFINE(HAVE_OCI_ENV_CREATE,1,[ ]) - ], [], [ - -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD - ]) - - PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2, - [ - AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ]) - ], [], [ - -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD - ]) - - dnl - dnl OCI_ATTR_STATEMENT is not available in all 8.1.x versions - dnl - PHP_OCI_IF_DEFINED(OCI_ATTR_STATEMENT, [AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])], $OCI8_INCLUDES) + AC_MSG_ERROR([Oracle client libraries < 9.0 are not supported any more. Please consider upgrading.]) ;; 9.0) @@ -300,7 +263,7 @@ AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ]) ;; *) - AC_MSG_ERROR([Unsupported Oracle version!]) + AC_MSG_ERROR([Oracle version $OCI8_VERSION is not supported]) ;; esac @@ -399,7 +362,7 @@ ;; *) - AC_MSG_ERROR([Unsupported Oracle Instant Client version]) + AC_MSG_ERROR([Oracle Instant CLient version $PHP_OCI8_INSTANT_CLIENT is not supported]) ;; esac
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php