From 8ba4c037e64035416e0cfd5174bf04571fb74b49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Thu, 30 Mar 2000 01:52:53 -0800
Subject: [PATCH] some bugfixes for Oracle

Rev: src/modules/Oracle/configure.in:1.18
Rev: src/modules/Oracle/module.pmod.in:1.3
---
 src/modules/Oracle/configure.in   | 21 +++++++++++++++------
 src/modules/Oracle/module.pmod.in |  4 ++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/modules/Oracle/configure.in b/src/modules/Oracle/configure.in
index 69699047a6..c37d547ad5 100755
--- a/src/modules/Oracle/configure.in
+++ b/src/modules/Oracle/configure.in
@@ -1,5 +1,5 @@
 #
-# $Id: configure.in,v 1.17 2000/03/30 08:40:31 hubbe Exp $
+# $Id: configure.in,v 1.18 2000/03/30 09:52:53 hubbe Exp $
 #
 # Configure script for the oracle module
 #
@@ -255,13 +255,22 @@ EOF
 
     OLDLIBS=LIBS
     LIBS="$LIBS $ORACLE_LIBS"
-    AC_CHECK_LIB(client, oopen, [
-      LDFLAGS="$EXTRALDFLAGS $LDFLAGS"
+
+    AC_MSG_CHECKING(for working Oracle libs)
+    AC_CACHE_VAL(pike_cv_working_oracle,[
+      AC_TRY_COMPILE([
+#include <oci.h>
+],[
+  OCIInitialize(OCI_DEFAULT,0,0,0,0);
+],pike_cv_working_oracle=yes,pike_cv_working_oracle=no)
+    ])
+    AC_MSG_RESULT($pike_cv_working_oracle)
+    if test x$pike_cv_working_oracle = xyes ; then
       AC_DEFINE(HAVE_ORACLE)
-    ], [
+      LDFLAGS="$EXTRALDFLAGS $LDFLAGS"
+    else
       ORACLE_LIBS=""
-    ])
-    LIBS="$OLDLIBS"
+    fi
   fi
 
 else
diff --git a/src/modules/Oracle/module.pmod.in b/src/modules/Oracle/module.pmod.in
index 62cab62420..bdb85569fc 100644
--- a/src/modules/Oracle/module.pmod.in
+++ b/src/modules/Oracle/module.pmod.in
@@ -1,3 +1,5 @@
+#if consant(@module@.oracle)
+
 inherit @module@ : M;
 
 class oracle
@@ -31,3 +33,5 @@ class oracle
       }
     }
 }
+
+#endif
\ No newline at end of file
-- 
GitLab