Add the libdb2 type-existence tests to the top-level configure script.

Replace the generated header files in db2 with static ones that
include autoconf.h and make decisions based on the macros defined
there.  Omit some tests that test for things we assume now, like
"const" working and "size_t" being defined.  Update dependencies.

The libdb2 configure script now generates no header files.

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

diff --git a/src/configure.in b/src/configure.in
index be7d093075896238fef3d0e246747d398931291b..976f2fabbd86a6f210ec122779e96297764eb767 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -611,6 +611,10 @@ DO_TCL=
 test "$TCL_LIBS" != "" && DO_TCL=ok
 AC_SUBST(DO_TCL)
 dnl
+dnl types libdb2 wants
+dnl
+AC_CHECK_TYPES([ssize_t, u_char, u_int, u_long, u_int8_t, u_int16_t, u_int32_t, int8_t, int16_t, int32_t])
+dnl
 dnl Test for POSIX 2001 *printf support (X/Open System Interfaces extension
 dnl to ANSI/ISO C 1999 specification).  Specifically, positional
 dnl specifications; not checking for other features like %zx at present.

diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h
index fe248b34800740d0db10c74ddf43cd3eb55bc495..1fe2116b97c9ac71538e92df7e35c51b683b9cca 100644 (file)
--- a/src/include/k5-platform.h
+++ b/src/include/k5-platform.h
@@ -29,6 +29,7 @@
  *
  * Currently:
  * + make "static inline" work
+ * + [u]int{8,16,32}_t types
  * + 64-bit types and load/store code
  * + SIZE_MAX
  * + shared library init/fini hooks

diff --git a/src/plugins/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in
index 2b4344d879444806a8b02cb43182ff3981fc2856..dd6c02140a73088d8cfa6aec18f3f702c7286177 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/Makefile.in
@@ -20,10 +20,8 @@ SHLIB_EXPLIBS=$(SUPPORT_LIB)
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 
-AUTOCONF_HEADER=$(srcdir)/include/config.h.in
-
 all-unix:: includes all-libs
-all-prerecurse: include/config.h include/db-config.h
+all-prerecurse: $(HDRS)
 clean-unix:: clean-libs clean-includes
 
 includes:: $(HDRS)
@@ -31,18 +29,10 @@ includes:: $(HDRS)
 $(HDRDIR)/db.h: $(srcdir)/include/db.h
        $(CP) $(srcdir)/include/db.h $@
 $(HDRDIR)/db-config.h: include/db-config.h
-       $(CP) include/db-config.h $@
+       $(CP) $(srcdir)/include/db-config.h $@
 $(HDRDIR)/db-ndbm.h: $(srcdir)/include/db-ndbm.h
        $(CP) $(srcdir)/include/db-ndbm.h $@
 
-include/config.h include/db-config.h: include/generated.stmp
-include/generated.stmp: $(srcdir)/include/config.h.in $(srcdir)/include/db-config.h.in
-       cd $(thisconfigdir) && $(SHELL) config.status
-$(srcdir)/include/config.h.in: @MAINT@ $(srcdir)/include/autoconf.stmp
-$(srcdir)/include/autoconf.stmp: $(srcdir)/configure.in $(SRCTOP)/aclocal.m4
-       cd $(srcdir) && $(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS)
-       touch $(srcdir)/include/autoconf.stmp
-
 clean-includes::
        $(RM) $(HDRS) include/*.stmp
 @lib_frag@

diff --git a/src/plugins/kdb/db2/libdb2/btree/Makefile.in b/src/plugins/kdb/db2/libdb2/btree/Makefile.in
index 82b4839db7458568f67854f7e90da4337bb90f2c..159db01026aabff1f353154c11d7febcb8376e2a 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/btree/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/btree/Makefile.in
@@ -11,8 +11,6 @@ SRCS= $(STLIBOBJS:.o=.c)
 LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
                -I$(srcdir)/../db
 
-AUTOCONF_HEADER=$(srcdir)/../include/config.h.in
-
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
 @libobj_frag@
@@ -23,63 +21,75 @@ clean-unix:: clean-libobjs
 # the Makefile.in file
 #
 bt_close.so bt_close.po $(OUTPRE)bt_close.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h bt_close.c \
-  btree.h extern.h
-bt_conv.so bt_conv.po $(OUTPRE)bt_conv.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
   $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
   $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
-  ../include/config.h bt_conv.c btree.h extern.h
-bt_debug.so bt_debug.po $(OUTPRE)bt_debug.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
+  bt_close.c btree.h extern.h
+bt_conv.so bt_conv.po $(OUTPRE)bt_conv.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
   $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h bt_debug.c \
-  btree.h extern.h
+  $(srcdir)/../mpool/mpool.h bt_conv.c btree.h extern.h
+bt_debug.so bt_debug.po $(OUTPRE)bt_debug.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+  $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
+  $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
+  bt_debug.c btree.h extern.h
 bt_delete.so bt_delete.po $(OUTPRE)bt_delete.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h bt_delete.c \
-  btree.h extern.h
-bt_get.so bt_get.po $(OUTPRE)bt_get.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
   $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
   $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
-  ../include/config.h bt_get.c btree.h extern.h
+  bt_delete.c btree.h extern.h
+bt_get.so bt_get.po $(OUTPRE)bt_get.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
+  $(srcdir)/../mpool/mpool.h bt_get.c btree.h extern.h
 bt_open.so bt_open.po $(OUTPRE)bt_open.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/db-config.h $(SRCTOP)/include/k5-platform.h \
-  $(SRCTOP)/include/k5-thread.h $(srcdir)/../include/db-int.h \
+  $(SRCTOP)/include/k5-thread.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
   $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h bt_open.c \
-  btree.h extern.h
+  $(srcdir)/../mpool/mpool.h bt_open.c btree.h extern.h
 bt_overflow.so bt_overflow.po $(OUTPRE)bt_overflow.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h bt_overflow.c \
-  btree.h extern.h
-bt_page.so bt_page.po $(OUTPRE)bt_page.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
   $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
   $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
-  ../include/config.h bt_page.c btree.h extern.h
-bt_put.so bt_put.po $(OUTPRE)bt_put.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
+  bt_overflow.c btree.h extern.h
+bt_page.so bt_page.po $(OUTPRE)bt_page.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
+  $(srcdir)/../mpool/mpool.h bt_page.c btree.h extern.h
+bt_put.so bt_put.po $(OUTPRE)bt_put.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
+  $(srcdir)/../mpool/mpool.h bt_put.c btree.h extern.h
+bt_search.so bt_search.po $(OUTPRE)bt_search.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
   $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
   $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
-  ../include/config.h bt_put.c btree.h extern.h
-bt_search.so bt_search.po $(OUTPRE)bt_search.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
+  bt_search.c btree.h extern.h
+bt_seq.so bt_seq.po $(OUTPRE)bt_seq.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
   $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h bt_search.c \
-  btree.h extern.h
-bt_seq.so bt_seq.po $(OUTPRE)bt_seq.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../mpool/mpool.h bt_seq.c btree.h extern.h
+bt_split.so bt_split.po $(OUTPRE)bt_split.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
   $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
   $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
-  ../include/config.h bt_seq.c btree.h extern.h
-bt_split.so bt_split.po $(OUTPRE)bt_split.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h bt_split.c \
-  btree.h extern.h
+  bt_split.c btree.h extern.h
 bt_utils.so bt_utils.po $(OUTPRE)bt_utils.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h bt_utils.c \
-  btree.h extern.h
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+  $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
+  $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
+  bt_utils.c btree.h extern.h

diff --git a/src/plugins/kdb/db2/libdb2/configure.in b/src/plugins/kdb/db2/libdb2/configure.in
index fe1a08fa56d9ff4fbf8c4c0a727662aa45a42165..1e529eebafd1a7337b75c34bc453914d7cdaa4aa 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/configure.in
+++ b/src/plugins/kdb/db2/libdb2/configure.in
@@ -1,5 +1,4 @@
 K5_AC_INIT(db/db.c)
-AC_CONFIG_HEADER(include/config.h include/db-config.h)
 CONFIG_RULES
 
 AC_PATH_PROG(FALSE,false,:)
@@ -25,53 +24,8 @@ fi])
 FCTSH=$local_cv_program_fctsh
 AC_SUBST(FCTSH)
 
-dnl checks for libraries
-dnl checks for header files
-AC_CHECK_HEADERS(unistd.h stdint.h inttypes.h)
-dnl checks for typedefs
-AC_TYPE_SIZE_T
-
-dnl AC_COMPILE_TYPE(TYPE, DEFAULT)
-AC_DEFUN(AC_COMPILE_TYPE,
-[AC_REQUIRE([AC_HEADER_STDC])dnl
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(ac_cv_type_$1,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#endif], [$1 test_variable;], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
-AC_MSG_RESULT($ac_cv_type_$1)
-if test $ac_cv_type_$1 = no; then
-  AC_DEFINE($1, $2, [Define to \`$2' if not defined on system])
-fi
-])
-
-
-AC_CHECK_TYPE(ssize_t, int)
-
-AC_CHECK_TYPE(u_char, unsigned char)
-AC_CHECK_TYPE(u_int, unsigned int)
-AC_CHECK_TYPE(u_long, unsigned long)
-
-AC_CHECK_TYPE(int8_t, signed char)
-AC_CHECK_TYPE(u_int8_t, unsigned char)
-AC_CHECK_TYPE(int16_t, short)
-AC_CHECK_TYPE(u_int16_t, unsigned short)
-AC_COMPILE_TYPE(int32_t, int)
-AC_COMPILE_TYPE(u_int32_t, unsigned int)
-
-dnl checks for structures
-dnl checks for compiler characteristics
-dnl AC_C_BIGENDIAN - No, check at compile time; Darwin can build for multiple
-dnl                  targets in one tree.
-AC_CHECK_HEADERS(endian.h machine/endian.h sys/param.h)
-dnl sys/param.h for AIX 4.3.3 (actually sys/machine.h)
-dnl There's also sys/endian.h on IRIX, but we already check _MIPSE{L,B}.
-AC_C_CONST
-
 KRB5_BUILD_LIBRARY
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_PROGRAM
 KRB5_RUN_FLAGS
-AC_CONFIG_FILES(include/generated.stmp:Makefile.in)
 V5_AC_OUTPUT_MAKEFILE(. hash btree db mpool recno test)

diff --git a/src/plugins/kdb/db2/libdb2/db/Makefile.in b/src/plugins/kdb/db2/libdb2/db/Makefile.in
index f1ff7ba919d6e2cd22c08e69a62d0afecb219c1c..a8532fcd548c6ee153fad2b2f309144d57398f93 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/db/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/db/Makefile.in
@@ -6,8 +6,6 @@ STLIBOBJS=db.o
 
 LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool
 
-AUTOCONF_HEADER=$(srcdir)/../include/config.h.in
-
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
 @libobj_frag@
@@ -19,6 +17,7 @@ SRCS= $(STLIBOBJS:.o=.c)
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-db.so db.po $(OUTPRE)db.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
-  $(srcdir)/../include/db-int.h $(srcdir)/../include/db.h \
-  ../include/config.h db.c
+db.so db.po $(OUTPRE)db.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../include/db.h db.c

diff --git a/src/plugins/kdb/db2/libdb2/hash/Makefile.in b/src/plugins/kdb/db2/libdb2/hash/Makefile.in
index 3fd7843899d8096128af2f7543c25c92a10a9fd5..cfd90025b47916ac0cc6a61d73bf7a63b5531df5 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/hash/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/hash/Makefile.in
@@ -8,8 +8,6 @@ STLIBOBJS=      hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \
 LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
                -I$(srcdir)/../db
 
-AUTOCONF_HEADER=$(srcdir)/../include/config.h.in
-
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
 @libobj_frag@
@@ -21,38 +19,45 @@ SRCS= $(STLIBOBJS:.o=.c)
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-hash.so hash.po $(OUTPRE)hash.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
+hash.so hash.po $(OUTPRE)hash.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
+  $(srcdir)/../mpool/mpool.h extern.h hash.c hash.h page.h
+hash_bigkey.so hash_bigkey.po $(OUTPRE)hash_bigkey.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
   $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
   $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
-  ../include/config.h extern.h hash.c hash.h page.h
-hash_bigkey.so hash_bigkey.po $(OUTPRE)hash_bigkey.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h extern.h \
-  hash.h hash_bigkey.c page.h
+  extern.h hash.h hash_bigkey.c page.h
 hash_debug.so hash_debug.po $(OUTPRE)hash_debug.$(OBJEXT): \
   hash_debug.c
 hash_func.so hash_func.po $(OUTPRE)hash_func.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h extern.h \
-  hash.h hash_func.c page.h
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+  $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
+  $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
+  extern.h hash.h hash_func.c page.h
 hash_log2.so hash_log2.po $(OUTPRE)hash_log2.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h extern.h \
-  hash.h hash_log2.c page.h
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+  $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
+  $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
+  extern.h hash.h hash_log2.c page.h
 hash_page.so hash_page.po $(OUTPRE)hash_page.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h extern.h \
-  hash.h hash_page.c page.h
-hsearch.so hsearch.po $(OUTPRE)hsearch.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
-  $(srcdir)/../include/db-int.h $(srcdir)/../include/db.h \
-  ../include/config.h hsearch.c search.h
-dbm.so dbm.po $(OUTPRE)dbm.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
-  $(BUILDTOP)/include/db-ndbm.h $(BUILDTOP)/include/db.h \
-  $(srcdir)/../include/db-dbm.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h dbm.c \
-  hash.h
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+  $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
+  $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
+  extern.h hash.h hash_page.c page.h
+hsearch.so hsearch.po $(OUTPRE)hsearch.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../include/db.h hsearch.c search.h
+dbm.so dbm.po $(OUTPRE)dbm.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(BUILDTOP)/include/db-ndbm.h \
+  $(BUILDTOP)/include/db.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-dbm.h \
+  $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
+  $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
+  dbm.c hash.h

diff --git a/src/plugins/kdb/db2/libdb2/include/config.h b/src/plugins/kdb/db2/libdb2/include/config.h
new file mode 100644 (file)
index 0000000..ed56d13
--- /dev/null
+++ b/src/plugins/kdb/db2/libdb2/include/config.h
@@ -0,0 +1,23 @@
+/* This includes autoconf.h and defines u_int32_t.  */
+#include "db-config.h"
+
+#ifndef HAVE_U_INT16_T
+#define u_int16_t unsigned short
+#endif
+#ifndef HAVE_INT16_T
+#define int16_t short
+#endif
+
+#ifndef HAVE_INT8_T
+#define int8_t signed char
+#endif
+#ifndef HAVE_U_INT_8_T
+#define u_int_8_t unsigned char
+#endif
+#ifndef HAVE_INT32_T
+#define int32_t int
+#endif
+
+#ifndef HAVE_SSIZE_T
+#define ssize_t int
+#endif

diff --git a/src/plugins/kdb/db2/libdb2/include/db-config.h b/src/plugins/kdb/db2/libdb2/include/db-config.h
new file mode 100644 (file)
index 0000000..0ac7c91
--- /dev/null
+++ b/src/plugins/kdb/db2/libdb2/include/db-config.h
@@ -0,0 +1,17 @@
+#include "autoconf.h"
+
+#ifndef HAVE_U_CHAR
+#define u_char unsigned char
+#endif
+
+#ifndef HAVE_U_INT
+#define u_int unsigned int
+#endif
+
+#ifndef HAVE_U_LONG
+#define u_long unsigned long
+#endif
+
+#ifndef HAVE_U_INT32_T
+#define u_int32_t unsigned int
+#endif

diff --git a/src/plugins/kdb/db2/libdb2/include/db-config.h.in b/src/plugins/kdb/db2/libdb2/include/db-config.h.in
deleted file mode 100644 (file)
index bcd7991..0000000
--- a/src/plugins/kdb/db2/libdb2/include/db-config.h.in
+++ /dev/null
@@ -1,16 +0,0 @@
-/* include/db-config.h.in.  Derived from autoconf-generated config.h.in. */
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-#undef u_char
-#undef u_int
-#undef u_long
-
-#undef u_int32_t
-
-/* The number of bytes in a int.  */
-#undef SIZEOF_INT

diff --git a/src/plugins/kdb/db2/libdb2/include/db-int.h b/src/plugins/kdb/db2/libdb2/include/db-int.h
index bbb22925aabd182ce8a4809636c9618bd11f0e01..8329ee3d05d18f5cf7ca76d9e23cc8a7b221b7a5 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/include/db-int.h
+++ b/src/plugins/kdb/db2/libdb2/include/db-int.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1991, 1993
+ * Copyright (c) 1991, 1993, 2007
  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/plugins/kdb/db2/libdb2/mpool/Makefile.in b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
index 9da29c20a5ac80b2911b1f90e83c9cd7c1b9ddc8..0ae454a9be8cc44057c155870e1f9798e9b650a2 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
@@ -6,8 +6,6 @@ STLIBOBJS=mpool.o
 
 LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../db
 
-AUTOCONF_HEADER=$(srcdir)/../include/config.h.in
-
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
 @libobj_frag@
@@ -19,7 +17,8 @@ SRCS= $(STLIBOBJS:.o=.c)
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-mpool.so mpool.po $(OUTPRE)mpool.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
-  $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
-  $(srcdir)/../include/db.h ../include/config.h mpool.c \
-  mpool.h
+mpool.so mpool.po $(OUTPRE)mpool.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
+  mpool.c mpool.h

diff --git a/src/plugins/kdb/db2/libdb2/recno/Makefile.in b/src/plugins/kdb/db2/libdb2/recno/Makefile.in
index 6513f62c9ef652bf30946eb5d362d27f86cb1ff2..a4bb7fda36dfc1d7375c5035f25b6417a9c86a01 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/recno/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/recno/Makefile.in
@@ -8,8 +8,6 @@ STLIBOBJS=      rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \
 LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
                -I$(srcdir)/../db
 
-AUTOCONF_HEADER=$(srcdir)/../include/config.h.in
-
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
 @libobj_frag@
@@ -22,47 +20,55 @@ SRCS= $(STLIBOBJS:.o=.c)
 # the Makefile.in file
 #
 rec_close.so rec_close.po $(OUTPRE)rec_close.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \
-  $(srcdir)/../btree/extern.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h extern.h \
-  rec_close.c recno.h
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+  $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
+  $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
+  extern.h rec_close.c recno.h
 rec_delete.so rec_delete.po $(OUTPRE)rec_delete.$(OBJEXT): \
-  $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \
-  $(srcdir)/../btree/extern.h $(srcdir)/../include/db-int.h \
-  $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h extern.h \
-  rec_delete.c recno.h
-rec_get.so rec_get.po $(OUTPRE)rec_get.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
   $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
   $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
   $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
-  ../include/config.h extern.h rec_get.c recno.h
-rec_open.so rec_open.po $(OUTPRE)rec_open.$(OBJEXT): \
+  extern.h rec_delete.c recno.h
+rec_get.so rec_get.po $(OUTPRE)rec_get.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \
-  $(srcdir)/../btree/extern.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
   $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h extern.h \
-  rec_open.c recno.h
-rec_put.so rec_put.po $(OUTPRE)rec_put.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../mpool/mpool.h extern.h rec_get.c recno.h
+rec_open.so rec_open.po $(OUTPRE)rec_open.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
   $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
   $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
   $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
-  ../include/config.h extern.h rec_put.c recno.h
-rec_search.so rec_search.po $(OUTPRE)rec_search.$(OBJEXT): \
+  extern.h rec_open.c recno.h
+rec_put.so rec_put.po $(OUTPRE)rec_put.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \
-  $(srcdir)/../btree/extern.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
   $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h extern.h \
-  rec_search.c recno.h
-rec_seq.so rec_seq.po $(OUTPRE)rec_seq.$(OBJEXT): $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../mpool/mpool.h extern.h rec_put.c recno.h
+rec_search.so rec_search.po $(OUTPRE)rec_search.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
   $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
   $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
   $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
-  ../include/config.h extern.h rec_seq.c recno.h
-rec_utils.so rec_utils.po $(OUTPRE)rec_utils.$(OBJEXT): \
+  extern.h rec_search.c recno.h
+rec_seq.so rec_seq.po $(OUTPRE)rec_seq.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \
-  $(srcdir)/../btree/extern.h $(srcdir)/../include/db-int.h \
+  $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
+  $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
   $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
-  $(srcdir)/../mpool/mpool.h ../include/config.h extern.h \
-  rec_utils.c recno.h
+  $(srcdir)/../mpool/mpool.h extern.h rec_seq.c recno.h
+rec_utils.so rec_utils.po $(OUTPRE)rec_utils.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
+  $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
+  $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+  $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
+  $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
+  extern.h rec_utils.c recno.h

diff --git a/src/plugins/kdb/db2/libdb2/test/Makefile.in b/src/plugins/kdb/db2/libdb2/test/Makefile.in
index baf9df19fac23f4c8ff1370c50ee881a827f5678..cd7538dcde0c5c77e3189bf86c32cf1d2cfdd325 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/test/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/test/Makefile.in
@@ -17,8 +17,6 @@ KRB5_RUN_ENV= @KRB5_RUN_ENV@
 DB_LIB         = -ldb
 DB_DEPLIB      = ../libdb$(DEPLIBEXT)
 
-AUTOCONF_HEADER=$(srcdir)/../include/config.h.in
-
 all::
 
 dbtest: dbtest.o $(DB_DEPLIB)