You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2009/02/13 07:52:37 UTC
svn commit: r744010 - in /apr/apr-util/branches/1.4.x: ./ CHANGES
build/dbd.m4
Author: bojan
Date: Fri Feb 13 06:52:37 2009
New Revision: 744010
URL: http://svn.apache.org/viewvc?rev=744010&view=rev
Log:
Backport r744009 from the trunk.
Add Oracle 11 support.
Modified:
apr/apr-util/branches/1.4.x/ (props changed)
apr/apr-util/branches/1.4.x/CHANGES
apr/apr-util/branches/1.4.x/build/dbd.m4
Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 13 06:52:37 2009
@@ -1 +1 @@
-/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986
+/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009
Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=744010&r1=744009&r2=744010&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Fri Feb 13 06:52:37 2009
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with APR-util 1.4.0
+ *) Add Oracle 11 support. [Bojan Smojver]
+
*) apr_dbd_freetds: Avoid segfault when process is NULL.
Do no print diagnostics to stderr. Never allow driver to exit
process. [Bojan Smojver]
Modified: apr/apr-util/branches/1.4.x/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/dbd.m4?rev=744010&r1=744009&r2=744010&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/build/dbd.m4 (original)
+++ apr/apr-util/branches/1.4.x/build/dbd.m4 Fri Feb 13 06:52:37 2009
@@ -336,9 +336,15 @@
AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1],[
unset ac_cv_lib_clntsh_OCIEnvCreate
- oracle_LIBS="-lnnz10"
+ oracle_LIBS="-lnnz11"
APR_ADDTO(LIBS, [$oracle_LIBS])
- AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1])
+ AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1],[
+ unset ac_cv_lib_clntsh_OCIEnvCreate
+ APR_REMOVEFROM(LIBS, [$oracle_LIBS])
+ oracle_LIBS="-lnnz10"
+ APR_ADDTO(LIBS, [$oracle_LIBS])
+ AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1])
+ ])
]))
elif test "$withval" = "no"; then
:
@@ -357,9 +363,15 @@
AC_MSG_NOTICE(checking for oracle in $withval)
AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1],[
unset ac_cv_lib_clntsh_OCIEnvCreate
- oracle_LIBS="-lnnz10"
+ oracle_LIBS="-lnnz11"
APR_ADDTO(LIBS, [$oracle_LIBS])
- AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1])
+ AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1],[
+ unset ac_cv_lib_clntsh_OCIEnvCreate
+ APR_REMOVEFROM(LIBS, [$oracle_LIBS])
+ oracle_LIBS="-lnnz10"
+ APR_ADDTO(LIBS, [$oracle_LIBS])
+ AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1])
+ ])
]))
if test "$apu_have_oracle" != "0"; then
oracle_LDFLAGS="$oracle_LDFLAGS -R$withval/lib"