From a146a2cb15203f6779a38ca3031f8e6983b2201f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Wed, 29 Mar 2000 14:27:10 -0800
Subject: [PATCH] should now work with Oracle8i
Rev: src/modules/Oracle/configure.in:1.16
Rev: src/modules/Oracle/oracle.c:1.26
---
src/modules/Oracle/configure.in | 18 ++++++++++++------
src/modules/Oracle/oracle.c | 11 +++++++----
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/modules/Oracle/configure.in b/src/modules/Oracle/configure.in
index 8486c0a174..d0c44495c9 100755
--- a/src/modules/Oracle/configure.in
+++ b/src/modules/Oracle/configure.in
@@ -1,5 +1,5 @@
#
-# $Id: configure.in,v 1.15 2000/03/24 01:22:17 hubbe Exp $
+# $Id: configure.in,v 1.16 2000/03/29 22:27:10 hubbe Exp $
#
# Configure script for the oracle module
#
@@ -69,7 +69,9 @@ if test x$with_oracle = xyes; then
echo no > conftest
- if test x"$pike_cv_oracle_oracle_home" != xno -a -f "$pike_cv_oracle_oracle_home/lib/libcommon.a"; then
+ if test x"$pike_cv_oracle_oracle_home" != xno && \
+ test -f "$pike_cv_oracle_oracle_home/lib/libcommon.a" -o \
+ -f "$pike_cv_oracle_oracle_home/lib/libcommon8.a"; then
echo "$pike_cv_oracle_oracle_home/lib" > conftest
@@ -77,7 +79,7 @@ if test x$with_oracle = xyes; then
if test x"$pike_cv_oracle_oratab_file" = xno; then :; else
sed -e '/^#/d' < $pike_cv_oracle_oratab_file | while IFS=":" read sid dir bootstart; do
- if test -d "$dir/." -a -f "$dir/lib/libcommon.a"; then
+ if test -d "$dir/." && test -f "$dir/lib/libcommon.a" -o "$dir/lib/libcommon8.a"; then
if test x"$pike_cv_oracle_oracle_home" = xno; then
AC_DEFINE_UNQUOTED(ORACLE_HOME, "${dir}")
else
@@ -241,10 +243,14 @@ EOF
CPPFLAGS="-I$oracle_include_dir/rdbms/demo/ -I$oracle_include_dir/network/public/ -I$oracle_include_dir/plsql/public -I$oracle_include_dir/otrace/public -I ${CPPFLAGS}"
LDFLAGS="${LDFLAGS} -L$oracle_lib_dir -R$oracle_lib_dir"
- if test -f "$oracle_lib_dir/libcore4.a"; then
- ORACLE_LIBS="-lclntsh -lcommon -lcore4 -lnlsrtl3 $pike_cv_oracle_sysliblist $oracle_aio -lm -lcore4"
+ if test -f "$oracle_lib_dir/libcore8.a"; then
+ ORACLE_LIBS="-lclntsh"
else
- ORACLE_LIBS="-lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 $pike_cv_oracle_sysliblist $oracle_aio -lm -lcore3"
+ if test -f "$oracle_lib_dir/libcore4.a"; then
+ ORACLE_LIBS="-lclntsh -lcommon -lcore4 -lnlsrtl3 $pike_cv_oracle_sysliblist $oracle_aio -lm -lcore4"
+ else
+ ORACLE_LIBS="-lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 $pike_cv_oracle_sysliblist $oracle_aio -lm -lcore3"
+ fi
fi
OLDLIBS=LIBS
diff --git a/src/modules/Oracle/oracle.c b/src/modules/Oracle/oracle.c
index 38e532f718..94d3d7ce95 100644
--- a/src/modules/Oracle/oracle.c
+++ b/src/modules/Oracle/oracle.c
@@ -1,5 +1,5 @@
/*
- * $Id: oracle.c,v 1.25 2000/03/25 22:40:02 hubbe Exp $
+ * $Id: oracle.c,v 1.26 2000/03/29 22:27:10 hubbe Exp $
*
* Pike interface to Oracle databases.
*
@@ -35,10 +35,13 @@
#ifdef HAVE_ORACLE
+/* VERY VERY UGLY */
+#define MOTIF
+
#include <oci.h>
#include <math.h>
-RCSID("$Id: oracle.c,v 1.25 2000/03/25 22:40:02 hubbe Exp $");
+RCSID("$Id: oracle.c,v 1.26 2000/03/29 22:27:10 hubbe Exp $");
#define BLOB_FETCH_CHUNK 16384
@@ -1687,13 +1690,13 @@ static void call_atexits(void)
(*atexit_fnc[--atexit_cnt])();
}
-#else
+#else /* DYNAMIC_MODULE */
static void call_atexits(void)
{
}
-#endif
+#endif /* DYNAMIC_MODULE */
#else /* HAVE_ORACLE */
--
GitLab