summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
03c0529)
Fix Oracle rules.
Don't link in libucb on Suns. Instead, just use -lbsd where needed.
(which is only with gdss and afs stuff)
$(RM) concat(file,.ec) concat(file,.c)
#endif
#ifdef ORACLE
$(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: @@\
#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) @@\
#define sqlfile(file) @@\
concat(file,.pc): concat(file,.dc) @@\
concat(file,.c): concat(file,.pc) @@\
#if defined(SOLARIS)
OSDEFS= -DPOSIX -DSOLARIS -I/usr/openwin/include
OSLIBS= -L/usr/ccs/lib -lcurses -ltermcap -lresolv \
#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
*/
CURSES=
/* the curses and termcap libs are where they are on purpose. -vrt 4/28/93
*/
-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 */
/* SRCTOP is the root of the Moira source tree */
* location of library and includes.
*/
#define GDSS
* location of library and includes.
*/
#define GDSS
-#if !defined(sgi)
-LIBGDSS= /mit/gdss/`machtype`/libgdss.a
-#else
LIBGDSS= /mit/gdss/lib/libgdss.a
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
/*
#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 NEED_STRCASECMP if you don't have strcasecmp() in your libc.
/*
* Define NEED_STRCASECMP if you don't have strcasecmp() in your libc.
SQL_LIB= /usr/informix/lib/libsql.a
#endif
#ifdef ORACLE
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