From 2d1a62d265237eaee243edd40b88234fb6b76bfa Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 20 Jun 2007 05:18:59 +0000
Subject: 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
---
 src/plugins/kdb/db2/libdb2/include/config.h       | 23 +++++++++++++++++++++++
 src/plugins/kdb/db2/libdb2/include/db-config.h    | 17 +++++++++++++++++
 src/plugins/kdb/db2/libdb2/include/db-config.h.in | 16 ----------------
 src/plugins/kdb/db2/libdb2/include/db-int.h       |  2 +-
 4 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 src/plugins/kdb/db2/libdb2/include/config.h
 create mode 100644 src/plugins/kdb/db2/libdb2/include/db-config.h
 delete mode 100644 src/plugins/kdb/db2/libdb2/include/db-config.h.in

(limited to 'src/plugins/kdb/db2/libdb2/include')

diff --git a/src/plugins/kdb/db2/libdb2/include/config.h b/src/plugins/kdb/db2/libdb2/include/config.h
new file mode 100644
index 000000000..ed56d13ad
--- /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
index 000000000..0ac7c9163
--- /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
index bcd7991b3..000000000
--- 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 bbb22925a..8329ee3d0 100644
--- 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
-- 
cgit