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 2006/12/29 06:19:12 UTC
svn commit: r490919 - /apr/apr-util/trunk/build/dbd.m4
Author: bojan
Date: Thu Dec 28 21:19:09 2006
New Revision: 490919
URL: http://svn.apache.org/viewvc?view=rev&rev=490919
Log:
Detect libnnz10.so, required for Oracle XE 10.2 client
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?view=diff&rev=490919&r1=490918&r2=490919
==============================================================================
--- apr/apr-util/trunk/build/dbd.m4 (original)
+++ apr/apr-util/trunk/build/dbd.m4 Thu Dec 28 21:19:09 2006
@@ -283,7 +283,14 @@
], [
apu_have_oracle=0
if test "$withval" = "yes"; then
- AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1]))
+ AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1],[
+ unset ac_cv_lib_clntsh_OCIEnvCreate
+ AC_CHECK_LIB(clntsh, OCIEnvCreate, [
+ apu_have_oracle=1
+ APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lnnz10])
+ APR_ADDTO(APRUTIL_LIBS,[-lnnz10])
+ ],,[-lnnz10])
+ ]))
elif test "$withval" = "no"; then
apu_have_oracle=0
else
@@ -297,7 +304,14 @@
APR_ADDTO(LDFLAGS, [$oracle_LDFLAGS])
AC_MSG_NOTICE(checking for oracle in $withval)
- AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1]))
+ AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1],[
+ unset ac_cv_lib_clntsh_OCIEnvCreate
+ AC_CHECK_LIB(clntsh, OCIEnvCreate, [
+ apu_have_oracle=1
+ APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lnnz10])
+ APR_ADDTO(APRUTIL_LIBS,[-lnnz10])
+ ],,[-lnnz10])
+ ]))
if test "$apu_have_oracle" != "0"; then
APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
APR_ADDTO(APRUTIL_LDFLAGS, [-R$withval/lib])
@@ -310,7 +324,14 @@
fi
], [
apu_have_oracle=0
- AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1]))
+ AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1],[
+ unset ac_cv_lib_clntsh_OCIEnvCreate
+ AC_CHECK_LIB(clntsh, OCIEnvCreate, [
+ apu_have_oracle=1
+ APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lnnz10])
+ APR_ADDTO(APRUTIL_LIBS,[-lnnz10])
+ ],,[-lnnz10])
+ ]))
])
AC_SUBST(apu_have_oracle)