diff options
| author | bojan <bojan@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-13 06:50:17 +0000 |
|---|---|---|
| committer | bojan <bojan@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-13 06:50:17 +0000 |
| commit | 140d90ce6c8832e43bcb602e21bd31ccbae4586f (patch) | |
| tree | 4f939b201e4a199401c3ea6263d6cfd61649e619 | |
| parent | 522946ace43cba03c30f86f13c5e7131098f4ce2 (diff) | |
| download | libapr-util-140d90ce6c8832e43bcb602e21bd31ccbae4586f.tar.gz | |
Add Oracle 11 support.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@744009 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/dbd.m4 | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/build/dbd.m4 b/build/dbd.m4 index 13d73d87..6696f61a 100644 --- a/build/dbd.m4 +++ b/build/dbd.m4 @@ -336,9 +336,15 @@ AC_DEFUN([APU_CHECK_DBD_ORACLE], [ 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_DEFUN([APU_CHECK_DBD_ORACLE], [ 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" |