DBMS=ORACLE

Fix Oracle rules.
Don't link in libucb on Suns. Instead, just use -lbsd where needed.
(which is only with gdss and afs stuff)

diff --git a/util/imake.includes/Imake.rules b/util/imake.includes/Imake.rules
index 2a5a81dc4c70447a97786ddcb7259feac200a911..3bff17ff0e9b5f92d29607b3751b12281f67f999 100644 (file)
--- a/util/imake.includes/Imake.rules
+++ b/util/imake.includes/Imake.rules
@@ -457,13 +457,19 @@ clean::                                                                   @@\
        $(RM) concat(file,.ec) concat(file,.c)
 #endif
 #ifdef ORACLE
+/* have to undef these to keep the ORADEFS line from being attacked */
+#undef HESIOD
+#undef ZEPHYR
+#undef GDSS
+#undef ATHENA
+ORADEFS= DEFINE=HESIOD DEFINE=ZEPHYR DEFINE=GDSS DEFINE=ATHENA
 #define sqlrule()                                                      @@\
 .SUFFIXES: .pc .dc                                                     @@\
 .dc.pc:                                                                        @@\
        $(AWK) -f $(SRCTOP)/util/imake.includes/oracle.awk < $< > $*.pc @@\
                                                                        @@\
 .pc.c:                                                                 @@\
-       /usr/oracle/bin/pcc INAME=$*.pc
+       /usr/oracle/bin/proc INAME=$*.pc INCLUDE=$(BUILDTOP)/include INCLUDE=$(BUILDTOP)/lib INCLUDE=$(INCLDIR) $(ORADEFS)
 #define sqlfile(file)                                                  @@\
 concat(file,.pc): concat(file,.dc)                                     @@\
 concat(file,.c): concat(file,.pc)                                      @@\

diff --git a/util/imake.includes/config.Imakefile b/util/imake.includes/config.Imakefile
index 58d08e35ea49f947db7ea4f148846c32e6b27d75..bf4e7b9083e2e7f9816d0b5959f0658d5df29ae4 100644 (file)
--- a/util/imake.includes/config.Imakefile
+++ b/util/imake.includes/config.Imakefile
@@ -41,7 +41,7 @@ OSDEFS= -DPOSIX
 #if defined(SOLARIS)
 OSDEFS= -DPOSIX -DSOLARIS -I/usr/openwin/include
 OSLIBS= -L/usr/ccs/lib -lcurses -ltermcap -lresolv \
-       -lsocket -lnsl -lc /usr/ucblib/libucb.a -lelf -ldl
+       -lsocket -lnsl -lc -lelf -ldl
 CURSES= 
 /* the curses and termcap libs are where they are on purpose. -vrt 4/28/93
  */
@@ -52,7 +52,7 @@ OSLIBS= -lresolv
 #endif
 
 
-GLOBAL_CDEFS= -DHESIOD -DZEPHYR -DGDSS -DATHENA -DDBMS=INGRES -I/usr/athena/include $(OSDEFS)
+GLOBAL_CDEFS= -DHESIOD -DZEPHYR -DGDSS -DATHENA -DDBMS=ORACLE -I/usr/athena/include $(OSDEFS)
 
 
 /* SRCTOP is the root of the Moira source tree */
@@ -129,18 +129,21 @@ LZEPHYR=-lzephyr
  * location of library and includes.
  */
 #define GDSS
-#if !defined(sgi)
-LIBGDSS= /mit/gdss/`machtype`/libgdss.a
-#else
+#ifdef sgi
 LIBGDSS= /mit/gdss/lib/libgdss.a
+#else
+#ifdef SOLARIS
+LIBGDSS= /mit/gdss/`machtype`/libgdss.a -lbsd
+#else
+LIBGDSS= /mit/gdss/`machtype`/libgdss.a
+#endif
 #endif
 GDSSINC= -I/mit/gdss/include
 
 /*
- * Define your DBMS here.  Currently, the code will work with either
- * INGRES or INFORMIX.
+ * Define your DBMS here.  Currently only ORACLE is supported.
  */
-#define INGRES
+#define ORACLE
 
 /*
  * Define NEED_STRCASECMP if you don't have strcasecmp() in your libc.
@@ -214,7 +217,7 @@ SQL_LIB= /usr/ingres/lib/libingres.a -lm
 SQL_LIB= /usr/informix/lib/libsql.a
 #endif
 #ifdef ORACLE
-SQL_LIB= /usr/oracle/lib/#########
+SQL_LIB= -L/usr/oracle/lib -lsql /usr/oracle/lib/osntab.o -lsqlnet -lora -lsqlnet -lora -lnlsrtl -lcv6 -lcore -lnlsrtl -lcv6 -lcore -lsocket -lnsl -lm -lm -ldl -laio
 #endif