svn commit: r497274 - /apr/apr-util/trunk/build/dbd.m4

[bo...@apache.org]

Author: bojan
Date: Wed Jan 17 17:10:42 2007
New Revision: 497274

URL: http://svn.apache.org/viewvc?view=rev&rev=497274
Log:
Introduce --with-oracle-include (use: e.g. Oracle Instant Client 10g)

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=497274&r1=497273&r2=497274
==============================================================================
--- apr/apr-util/trunk/build/dbd.m4 (original)
+++ apr/apr-util/trunk/build/dbd.m4 Wed Jan 17 17:10:42 2007
@@ -274,11 +274,22 @@
 AC_DEFUN([APU_CHECK_DBD_ORACLE], [
   apu_have_oracle=0
 
+  AC_ARG_WITH([oracle-include],
+    APR_HELP_STRING([--with-oracle-include=DIR], [path to Oracle include files]))
   AC_ARG_WITH([oracle], 
     APR_HELP_STRING([--with-oracle=DIR], [enable Oracle DBD driver; giving ORACLE_HOME as DIR]),
   [
     apu_have_oracle=0
     if test "$withval" = "yes"; then
+      old_cppflags="$CPPFLAGS"
+
+      if test -n "$with_oracle_include"; then
+        oracle_CPPFLAGS="$CPPFLAGS -I$with_oracle_include"
+        APR_ADDTO(APRUTIL_INCLUDES, [-I$with_oracle_include])
+      fi
+
+      APR_ADDTO(CPPFLAGS, [$oracle_CPPFLAGS])
+
       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, [
@@ -287,13 +298,20 @@
           APR_ADDTO(APRUTIL_LIBS,[-lnnz10])
         ],,[-lnnz10])
       ]))
+
+      CPPFLAGS="$old_cppflags"
     elif test "$withval" = "no"; then
       apu_have_oracle=0
     else
       old_cppflags="$CPPFLAGS"
       old_ldflags="$LDFLAGS"
 
-      oracle_CPPFLAGS="-I$withval/rdbms/demo -I$withval/rdbms/public"
+      if test -n "$with_oracle_include"; then
+        oracle_CPPFLAGS="$CPPFLAGS -I$with_oracle_include"
+        APR_ADDTO(APRUTIL_INCLUDES, [-I$with_oracle_include])
+      else
+        oracle_CPPFLAGS="-I$withval/rdbms/demo -I$withval/rdbms/public"
+      fi
       oracle_LDFLAGS="-L$withval/lib "
 
       APR_ADDTO(CPPFLAGS, [$oracle_CPPFLAGS])
@@ -311,8 +329,10 @@
       if test "$apu_have_oracle" != "0"; then
         APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
         APR_ADDTO(APRUTIL_LDFLAGS, [-R$withval/lib])
-        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/rdbms/demo])
-        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/rdbms/public])
+        if test -z "$with_oracle_include"; then
+          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/rdbms/demo])
+          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/rdbms/public])
+        fi
       fi
 
       CPPFLAGS="$old_cppflags"
@@ -320,6 +340,16 @@
     fi
   ], [
     apu_have_oracle=0
+
+    old_cppflags="$CPPFLAGS"
+
+    if test -n "$with_oracle_include"; then
+      oracle_CPPFLAGS="$CPPFLAGS -I$with_oracle_include"
+      APR_ADDTO(APRUTIL_INCLUDES, [-I$with_oracle_include])
+    fi
+
+    APR_ADDTO(CPPFLAGS, [$oracle_CPPFLAGS])
+
     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, [
@@ -328,6 +358,8 @@
         APR_ADDTO(APRUTIL_LIBS,[-lnnz10])
       ],,[-lnnz10])
     ]))
+
+    CPPFLAGS="$old_cppflags"
   ])
 
   AC_SUBST(apu_have_oracle)