From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Thu, 9 Dec 2004 12:45:07 +0000 (+0000)
Subject: blaat
X-Git-Tag: release-0.50~735
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9617d03d5bc7766ae7204c55fd1b4f04eec5783f;p=thirdparty%2Fldns.git

blaat
---

diff --git a/common.h.in b/common.h.in
index 89a9aafb..af7eaa34 100644
--- a/common.h.in
+++ b/common.h.in
@@ -1,28 +1,77 @@
-/* 
- * common.h
- * local header file includes
- * .in file for autoconf
- *
- * (c) NLnet Labs, 2004
- *
- * See the file LICENSE for the license
- *
- */
+/* common.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
+
+/* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <netinet/in.hctype.h> header file. */
+#undef HAVE_NETINET_IN_HCTYPE_H
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+#undef HAVE_OPENSSL_SSL_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+#undef HAVE_SYS_MOUNT_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
 
-/* gnu long options */
-#ifdef HAVE_GETOPT_H  
-#include <getopt.h>   
-#endif /*HAVE_GETOPT_H*/
+/* System configuration dir */
+#undef SYSCONFDIR
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
 #endif
diff --git a/configure.ac b/configure.ac
index 277d56ba..f7afe791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,9 +48,39 @@ AC_CHECK_HEADERS(sys/param.h sys/mount.h,,,
 
 #AC_SEARCH_LIBS(RSA_new, [crypto])
 
-AC_DEFINE_UNQUOTED(SYSCONFDIR, "$sysconfdir")
+AC_DEFINE([SYSCONFDIR], [$sysconfdir], [System configuration dir])
+
+AH_BOTTOM([
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <assert.h>
+
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+])
+
 
 AC_CONFIG_FILES([Makefile 
                  ])
-AC_CONFIG_HEADER([common.h])
+AC_CONFIG_HEADER([config.h])
 AC_OUTPUT