apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r744009 - /apr/apr-util/trunk/build/dbd.m4
Date Fri, 13 Feb 2009 06:50:18 GMT
Author: bojan
Date: Fri Feb 13 06:50:17 2009
New Revision: 744009

URL: http://svn.apache.org/viewvc?rev=744009&view=rev
Log:
Add Oracle 11 support.

Modified:
    apr/apr-util/trunk/build/dbd.m4

Modified: apr/apr-util/trunk/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/dbd.m4?rev=744009&r1=744008&r2=744009&view=diff
==============================================================================
--- apr/apr-util/trunk/build/dbd.m4 (original)
+++ apr/apr-util/trunk/build/dbd.m4 Fri Feb 13 06:50:17 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"



Mime
View raw message