Use sys/cdefs.h if present (e.g. linux)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5914 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 27 insertions, 2 deletions

diff --git a/src/util/berk_db/hash/ChangeLog b/src/util/berk_db/hash/ChangeLog
index e1bd2c4fe..4c0abbc86 100644
--- a/src/util/berk_db/hash/ChangeLog
+++ b/src/util/berk_db/hash/ChangeLog
@@ -1,3 +1,8 @@
+
+Tue May 30 10:41:23 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in: Check for sys/cdefs.h.
+	* Makefile.in: If sys/cdefs.h present, don't use the one in PORT/krb5.
+
 Tue May 30 09:53:05 1995  Ezra Peisach  (epeisach@kangaroo.mit.edu)
 
 	* krb5_ndbm.c: If the size field of datum and DBT do not match,
diff --git a/src/util/berk_db/hash/Makefile.in b/src/util/berk_db/hash/Makefile.in
index cdaf4d41f..5155a0274 100644
--- a/src/util/berk_db/hash/Makefile.in
+++ b/src/util/berk_db/hash/Makefile.in
@@ -12,7 +12,9 @@ CFLAGS = $(CCOPTS) $(DEFS) -D__DBINTERFACE_PRIVATE $(LOCALINCLUDE) $(HASH_DEBUGO
 ##DOSLIBNAME=..\db.lib
 ##DOS!include $(BUILDTOP)\config\windows.in
 
-LOCALINCLUDE=-I$(srcdir)/../PORT/krb5		\
+CDEFS_INCLUDE = @CDEFS_INCLUDE@
+
+LOCALINCLUDE=$(CDEFS_INCLUDE)			\
 	-I$(srcdir)/../PORT/krb5/include	\
 	-I$(srcdir)/../PORT/include		\
 	-I$(srcdir)/../include			\
diff --git a/src/util/berk_db/hash/configure.in b/src/util/berk_db/hash/configure.in
index 2d49046af..32c376c6f 100644
--- a/src/util/berk_db/hash/configure.in
+++ b/src/util/berk_db/hash/configure.in
@@ -48,6 +48,12 @@ AC_DEFINE_UNQUOTED(SIZEOF_DBT_SIZE, $ac_cv_sizeof_dbt_size)
 
 AC_HAVE_FUNCS(mktemp mkstemp)
 CHECK_SIGNALS
+dnl
+dnl Check for sys/cdefs.h.
+dnl
+CDEFS_INCLUDE=["-I$(srcdir)/../PORT/krb5"]
+AC_HAVE_HEADERS(sys/cdefs.h, CDEFS_INCLUDE=)
+AC_SUBST(CDEFS_INCLUDE)
 SubdirLibraryRule([$(OBJS)])
 KRB_INCLUDE
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/berk_db/test/ChangeLog b/src/util/berk_db/test/ChangeLog
index 904283fe1..629e5b076 100644
--- a/src/util/berk_db/test/ChangeLog
+++ b/src/util/berk_db/test/ChangeLog
@@ -1,3 +1,8 @@
+
+Tue May 30 10:42:06 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in: Check for sys/cdefs.h.
+	* Makefile.in: If sys/cdefs.h present, don't use the one in PORT/krb5.
+
 Tue May 30 06:30:08 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* Makefile.in (CFLAGS): Added $(DEFS) so that configure determined
diff --git a/src/util/berk_db/test/Makefile.in b/src/util/berk_db/test/Makefile.in
index 2994387fd..3ec0c7bfb 100644
--- a/src/util/berk_db/test/Makefile.in
+++ b/src/util/berk_db/test/Makefile.in
@@ -7,7 +7,8 @@ OBJS=	dbtest.o strerror.o
 # Uncomment the STAT line get hash and btree statistical use info.  This
 # also forces ld to load the btree debug functions for use by gdb, which
 # is useful.  The db library has to be compiled with -DSTATISTICS as well.
-INC=	-I${PORTDIR}/include -I${PORTDIR} -I${PORTDIR}/../../include -I${PORTDIR}/../../../include
+CDEFS_INCLUDE = @CDEFS_INCLUDE@
+INC=	-I${PORTDIR}/include $(CDEFS_INCLUDE) -I${PORTDIR}/../../include -I${PORTDIR}/../../../include
 OORG=	-g
 #STAT=	-DSTATISTICS
 CFLAGS=	-D__DBINTERFACE_PRIVATE -DDEBUG ${STAT} ${OORG} ${INC} ${DEFS}
diff --git a/src/util/berk_db/test/configure.in b/src/util/berk_db/test/configure.in
index cf48ab501..af733e0dd 100644
--- a/src/util/berk_db/test/configure.in
+++ b/src/util/berk_db/test/configure.in
@@ -4,4 +4,10 @@ WITH_CCOPTS
 WITH_KRB5ROOT
 CONFIG_RULES
 CHECK_SIGNALS
+dnl
+dnl Check for sys/cdefs.h.
+dnl
+CDEFS_INCLUDE=["-I$(PORTDIR)"]
+AC_HAVE_HEADERS(sys/cdefs.h, CDEFS_INCLUDE=)
+AC_SUBST(CDEFS_INCLUDE)
 V5_AC_OUTPUT_MAKEFILE