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

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

diff --git a/src/util/berk_db/hash/ChangeLog b/src/util/berk_db/hash/ChangeLog
index e1bd2c4fe21530a29907ffd598501bebd39a1df0..4c0abbc865b9c10e05d814a70fa6c9e519230265 100644 (file)
--- 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 cdaf4d41fa953a6fe125792203f5502971db77eb..5155a02743a7e9335bec7cbe75a58a738ba0270d 100644 (file)
--- 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 2d49046afb7ac3b070cb87b219983584851c0cf5..32c376c6f241b33f7635b8f3c1543f0c9a5a0f08 100644 (file)
--- 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 904283fe1fd89133a7d0412616f151e6e25dc3bb..629e5b076667b1b05dca7db0d7b98ced378e4c22 100644 (file)
--- 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 2994387fd8c01d277d192c00e0e6298cfda54378..3ec0c7bfbe1ac18d1e4489ad5f5a0328deb5c22a 100644 (file)
--- 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 cf48ab5011d9f504470d8a1492b42037454f4bfc..af733e0ddcae1ff150b09862b419f383dff17cba 100644 (file)
--- 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