AUTOCONF_1_0 landing.PROGRESS_19980909_BASEPROGRESS_19980824_BASEColorSync_19980824_BASE

6 files changed, 176 insertions, 2 deletions

diff --git a/dbm/Makefile.in b/dbm/Makefile.in
new file mode 100644
index 000000000..dcd6f8c70
--- /dev/null
+++ b/dbm/Makefile.in
@@ -0,0 +1,18 @@
+#! gmake
+
+DEPTH = ..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = dbm
+
+RELEASE = dbm
+
+DIRS =  include \
+        src     \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/dbm/include/Makefile.in b/dbm/include/Makefile.in
new file mode 100644
index 000000000..a3e0c5517
--- /dev/null
+++ b/dbm/include/Makefile.in
@@ -0,0 +1,36 @@
+#! gmake
+
+DEPTH = ../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = dbm
+
+EXPORTS =	nsres.h   \
+		cdefs.h   \
+		mcom_db.h \
+		ncompat.h \
+		winfile.h \
+		$(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+PRIVATE_EXPORTS =	hsearch.h \
+			page.h    \
+			extern.h  \
+			ndbm.h    \
+			queue.h   \
+			hash.h    \
+			mpool.h   \
+			search.h  \
+			$(NULL)
+
+PRIVATE_EXPORTS := $(addprefix $(srcdir)/, $(PRIVATE_EXPORTS))
+
+include $(topsrcdir)/config/rules.mk
+
+
+
diff --git a/dbm/include/mcom_db.h b/dbm/include/mcom_db.h
index 5abf0a8f0..1657c5724 100644
--- a/dbm/include/mcom_db.h
+++ b/dbm/include/mcom_db.h
@@ -49,7 +49,7 @@
 #define BIG_ENDIAN      4321
 #define LITTLE_ENDIAN   1234            /* LSB first: i386, vax, all NT risc */
 
-#ifndef SVR4
+#if !defined(SVR4) && !defined(__svr4__)
 /* compat.h is only in 4.1.3 machines. - dp */
 #include <compat.h>
 #endif
diff --git a/dbm/src/Makefile.in b/dbm/src/Makefile.in
new file mode 100644
index 000000000..0a8a5b472
--- /dev/null
+++ b/dbm/src/Makefile.in
@@ -0,0 +1,38 @@
+#! gmake
+
+DEPTH = ../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = dbm
+
+CSRCS = db.c	   \
+	h_bigkey.c \
+	h_func.c   \
+	h_log2.c   \
+	h_page.c   \
+	hash.c	   \
+	hash_buf.c \
+	hsearch.c  \
+	memmove.c  \
+	mktemp.c   \
+	ndbm.c	   \
+	snprintf.c \
+	strerror.c \
+	nsres.c	   \
+	$(NULL)
+
+LIBRARY_NAME = dbm
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG) -DNSPR20=1
+
+INCLUDES += -I$(srcdir)/../include
+
+ifeq ($(OS_ARCH),AIX)
+	OS_LIBS += -lc_r
+endif
diff --git a/dbm/src/snprintf.c b/dbm/src/snprintf.c
index 1778df19a..451a17a66 100644
--- a/dbm/src/snprintf.c
+++ b/dbm/src/snprintf.c
@@ -2,7 +2,7 @@
 #include <sys/types.h>
 #include <stddef.h>
 #include <stdio.h>
-#if defined(_WINDOWS) || defined(SOLARIS) || defined(AIXV3) || defined(AIX) || defined(OSF1) || defined(NEC)
+#if defined(_WINDOWS) || defined(SOLARIS) || defined(AIXV3) || defined(AIX) || defined(OSF1) || defined(NEC) || !defined(HAVE_SYS_CDEFS_H)
 #include "cdefs.h"
 #elif !defined(HPUX) && !defined(UNIXWARE) && !defined(SNI)
 #include <sys/cdefs.h>
diff --git a/dbm/tests/Makefile.in b/dbm/tests/Makefile.in
new file mode 100644
index 000000000..ab45d89ff
--- /dev/null
+++ b/dbm/tests/Makefile.in
@@ -0,0 +1,82 @@
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+CORE_DEPTH	= ../..
+
+MODULE		= dbm
+
+CSRCS		= lots.c
+
+PROGRAM		= lots
+
+include $(topsrcdir)/coreconf/config.mk
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DSTDARG
+LIBDBM		= ../src/$(PLATFORM)/dbm$(STATIC_LIB_SUFFIX)
+else
+LIBDBM		= ../src/$(PLATFORM)/libdbm$(STATIC_LIB_SUFFIX)
+endif
+
+ifeq ($(OS_ARCH),AIX)
+CFLAGS		+= -DSTDARG
+endif
+
+ifeq ($(OS_ARCH),BSD_386)
+CFLAGS		+= -g -I$(srcdir)/../../../include -DXP_UNIX -g -DBSDI -DHAVE_STRERROR -D__386BSD__ -DDEBUG -DMEMMOVE -D__DBINTERFACE_PRIVATE 
+endif
+
+ifeq ($(OS_ARCH),FreeBSD)
+CFLAGS		+= -DSTDARG
+endif
+
+ifeq ($(OS_ARCH),HP-UX)
+CFLAGS		+= -DSTDARG
+endif
+
+ifeq ($(OS_ARCH),IRIX)
+CFLAGS		+= -g -I$(srcdir)/../../../include -DDEBUG -DSTDARG
+endif
+
+ifeq ($(OS_ARCH),OSF1)
+CFLAGS		+= -DSTDARG
+endif
+
+ifeq ($(OS_ARCH),Linux)
+CFLAGS		+= -DSTDARG
+endif
+
+ifeq ($(OS_ARCH),NCR)
+CFLAGS		+= -DSTDARG
+endif
+
+ifeq ($(OS_ARCH),SCO_SV)
+CFLAGS		+= -DSTDARG
+endif
+
+ifeq ($(OS_ARCH),SunOS)
+CFLAGS		+= -g -I$(srcdir)/../../../include -D_sun_
+endif
+
+ifeq ($(OS_ARCH),UNIXWARE)
+CFLAGS		+= -DSTDARG
+endif
+
+INCLUDES	+= -I$(srcdir)/../include
+
+LDFLAGS		= $(LDOPTS) $(LIBDBM)
+
+include $(topsrcdir)/coreconf/rules.mk
+
+lots.pure: lots
+	purify $(CC) -o lots.pure $(CFLAGS) $(OBJS) $(MYLIBS)
+
+crash: crash.o $(MYLIBS)
+	$(CC) -o crash $(CFLAGS) crash.o $(MYLIBS)
+
+crash.pure: crash.o $(MYLIBS)
+	purify $(CC) -o crash.pure $(CFLAGS) crash.o $(MYLIBS)
+