commit 2864df4ae87fbf74aa89aaf80122e68587b76849
author Bojan Smojver <bojan@apache.org> Fri Feb 13 06:50:17 2009 +0000
committer Bojan Smojver <bojan@apache.org> Fri Feb 13 06:50:17 2009 +0000
tree 4f939b201e4a199401c3ea6263d6cfd61649e619
parent 6226d3d3e3cd0334fe8b1caaee40c884ec375e83

Add Oracle 11 support.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@744009 13f79535-47bb-0310-9956-ffa450edef68

build/dbd.m4

diff --git a/build/dbd.m4 b/build/dbd.m4
index 13d73d8..6696f61 100644
--- a/build/dbd.m4
+++ b/build/dbd.m4
@@ -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"