[src/trunk]: src/tools/compat Make using autoheader easier:

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/844eec225692
branches:  trunk
changeset: 588175:844eec225692
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sat Feb 11 01:28:01 2006 +0000

description:
Make using autoheader easier:
split off the autogenerated file into nbtool_config_internal.h,
and let nbtool_config.h be a file with the proper wrappers.

This way you can just change configure.ac, run autoconf and autoheader,
verify the result, and commit, but don't have to edit nbtool_config*in
manually every time.

diffstat:

 tools/compat/Makefile                    |    6 +-
 tools/compat/configure.ac                |    4 +-
 tools/compat/nbtool_config.h             |    9 +
 tools/compat/nbtool_config.h.in          |  528 -------------------------------
 tools/compat/nbtool_config_internal.h.in |  518 ++++++++++++++++++++++++++++++
 5 files changed, 532 insertions(+), 533 deletions(-)

diffs (truncated from 1110 to 300 lines):

diff -r d81bd5cbf36c -r 844eec225692 tools/compat/Makefile
--- a/tools/compat/Makefile     Sat Feb 11 00:56:08 2006 +0000
+++ b/tools/compat/Makefile     Sat Feb 11 01:28:01 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.40 2005/12/20 20:39:15 christos Exp $
+#      $NetBSD: Makefile,v 1.41 2006/02/11 01:28:01 wiz Exp $
 
 HOSTLIB=       nbcompat
 
@@ -55,7 +55,7 @@
 
 SRCS:=         ${SRCS:Nndbm*.c}
 
-config.cache: include/.stamp configure nbtool_config.h.in defs.mk.in
+config.cache: include/.stamp configure nbtool_config_internal.h.in defs.mk.in
        rm -f ${.TARGET}
        CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} LDFLAGS=${HOST_LDFLAGS:Q} \
                ${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache
@@ -74,7 +74,7 @@
 cleandir: compat.clean
 compat.clean:
        -rm -r -f include
-       -rm -f config.cache nbtool_config.h
+       -rm -f config.cache nbtool_config_internal.h
 
 HOST_CPPFLAGS:=        ${CPPFLAGS}
 CPPFLAGS:=     # empty
diff -r d81bd5cbf36c -r 844eec225692 tools/compat/configure.ac
--- a/tools/compat/configure.ac Sat Feb 11 00:56:08 2006 +0000
+++ b/tools/compat/configure.ac Sat Feb 11 01:28:01 2006 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: configure.ac,v 1.54 2006/02/11 00:54:35 wiz Exp $
+#      $NetBSD: configure.ac,v 1.55 2006/02/11 01:28:01 wiz Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
 
 AC_INIT([libnbcompat], [noversion], [lib-bug-people%NetBSD.org@localhost])
-AC_CONFIG_HEADERS(nbtool_config.h)
+AC_CONFIG_HEADERS(nbtool_config_internal.h)
 AC_CONFIG_FILES(defs.mk)
 
 AC_DEFUN([AC_NETBSD],
diff -r d81bd5cbf36c -r 844eec225692 tools/compat/nbtool_config.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/compat/nbtool_config.h      Sat Feb 11 01:28:01 2006 +0000
@@ -0,0 +1,9 @@
+/*     $NetBSD: nbtool_config.h,v 1.1 2006/02/11 01:28:01 wiz Exp $    */
+ 
+#ifndef        __NETBSD_NBTOOL_CONFIG_H__
+#define        __NETBSD_NBTOOL_CONFIG_H__
+
+#include "nbtool_config_internal.h"
+
+#include "compat_defs.h"
+#endif /* !__NETBSD_NBTOOL_CONFIG_H__ */
diff -r d81bd5cbf36c -r 844eec225692 tools/compat/nbtool_config.h.in
--- a/tools/compat/nbtool_config.h.in   Sat Feb 11 00:56:08 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,528 +0,0 @@
-/*     $NetBSD: nbtool_config.h.in,v 1.10 2006/02/11 00:55:17 wiz Exp $        */
- 
-/* When regenerating this file with autoheader, make sure that
-   the header and footer stay. */
-#ifndef        __NETBSD_NBTOOL_CONFIG_H__
-#define        __NETBSD_NBTOOL_CONFIG_H__
-
-/* nbtool_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the `asnprintf' function. */
-#undef HAVE_ASNPRINTF
-
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
-/* Define to 1 if you have the `atoll' function. */
-#undef HAVE_ATOLL
-
-/* Define to 1 if you have the `basename' function. */
-#undef HAVE_BASENAME
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
-
-/* Define to 1 if you have the declaration of `be16toh', and to 0 if you
-   don't. */
-#undef HAVE_DECL_BE16TOH
-
-/* Define to 1 if you have the declaration of `be32toh', and to 0 if you
-   don't. */
-#undef HAVE_DECL_BE32TOH
-
-/* Define to 1 if you have the declaration of `be64toh', and to 0 if you
-   don't. */
-#undef HAVE_DECL_BE64TOH
-
-/* Define to 1 if you have the declaration of `bswap16', and to 0 if you
-   don't. */
-#undef HAVE_DECL_BSWAP16
-
-/* Define to 1 if you have the declaration of `bswap32', and to 0 if you
-   don't. */
-#undef HAVE_DECL_BSWAP32
-
-/* Define to 1 if you have the declaration of `bswap64', and to 0 if you
-   don't. */
-#undef HAVE_DECL_BSWAP64
-
-/* Define to 1 if you have the declaration of `fstatvfs', and to 0 if you
-   don't. */
-#undef HAVE_DECL_FSTATVFS
-
-/* Define to 1 if you have the declaration of `htobe16', and to 0 if you
-   don't. */
-#undef HAVE_DECL_HTOBE16
-
-/* Define to 1 if you have the declaration of `htobe32', and to 0 if you
-   don't. */
-#undef HAVE_DECL_HTOBE32
-
-/* Define to 1 if you have the declaration of `htobe64', and to 0 if you
-   don't. */
-#undef HAVE_DECL_HTOBE64
-
-/* Define to 1 if you have the declaration of `htole16', and to 0 if you
-   don't. */
-#undef HAVE_DECL_HTOLE16
-
-/* Define to 1 if you have the declaration of `htole32', and to 0 if you
-   don't. */
-#undef HAVE_DECL_HTOLE32
-
-/* Define to 1 if you have the declaration of `htole64', and to 0 if you
-   don't. */
-#undef HAVE_DECL_HTOLE64
-
-/* Define to 1 if you have the declaration of `le16toh', and to 0 if you
-   don't. */
-#undef HAVE_DECL_LE16TOH
-
-/* Define to 1 if you have the declaration of `le32toh', and to 0 if you
-   don't. */
-#undef HAVE_DECL_LE32TOH
-
-/* Define to 1 if you have the declaration of `le64toh', and to 0 if you
-   don't. */
-#undef HAVE_DECL_LE64TOH
-
-/* Define to 1 if you have the declaration of `optind', and to 0 if you don't.
-   */
-#undef HAVE_DECL_OPTIND
-
-/* Define to 1 if you have the declaration of `optreset', and to 0 if you
-   don't. */
-#undef HAVE_DECL_OPTRESET
-
-/* Define to 1 if you have the declaration of `setgroupent', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SETGROUPENT
-
-/* Define to 1 if you have the declaration of `setpassent', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SETPASSENT
-
-/* Define to 1 if you have the declaration of `strsuftoll', and to 0 if you
-   don't. */
-#undef HAVE_DECL_STRSUFTOLL
-
-/* Define to 1 if you have the declaration of `sys_signame', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SYS_SIGNAME
-
-/* Define to 1 if you have the `devname' function. */
-#undef HAVE_DEVNAME
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the `dirfd' function. */
-#undef HAVE_DIRFD
-
-/* Define to 1 if you have the `dirname' function. */
-#undef HAVE_DIRNAME
-
-/* Define to 1 if `dd_fd' is member of `DIR'. */
-#undef HAVE_DIR_DD_FD
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if you have the <err.h> header file. */
-#undef HAVE_ERR_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the <features.h> header file. */
-#undef HAVE_FEATURES_H
-
-/* Define to 1 if you have the `fgetln' function. */
-#undef HAVE_FGETLN
-
-/* Define to 1 if you have the `flock' function. */
-#undef HAVE_FLOCK
-
-/* Define to 1 if you have the `fparseln' function. */
-#undef HAVE_FPARSELN
-
-/* Define to 1 if you have the `futimes' function. */
-#undef HAVE_FUTIMES
-
-/* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
-/* Define to 1 if you have the `getopt_long' function. */
-#undef HAVE_GETOPT_LONG
-
-/* Define to 1 if you have the `group_from_gid' function. */
-#undef HAVE_GROUP_FROM_GID
-
-/* Define to 1 if you have the <grp.h> header file. */
-#undef HAVE_GRP_H
-
-/* Define to 1 if you have the `heapsort' function. */
-#undef HAVE_HEAPSORT
-
-/* Define to 1 if the system has the type `id_t'. */
-#undef HAVE_ID_T
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `isblank' function. */
-#undef HAVE_ISBLANK
-
-/* Define to 1 if you have the `issetugid' function. */
-#undef HAVE_ISSETUGID
-
-/* Define to 1 if you have the `lchflags' function. */
-#undef HAVE_LCHFLAGS
-
-/* Define to 1 if you have the `lchmod' function. */
-#undef HAVE_LCHMOD
-
-/* Define to 1 if you have the `lchown' function. */
-#undef HAVE_LCHOWN
-
-/* Define to 1 if you have the <libgen.h> header file. */
-#undef HAVE_LIBGEN_H
-
-/* Define to 1 if you have the `regex' library (-lregex). */
-#undef HAVE_LIBREGEX
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define to 1 if the system has the type `long long'. */
-#undef HAVE_LONG_LONG
-
-/* Define to 1 if you have the `lutimes' function. */
-#undef HAVE_LUTIMES
-
-/* Define to 1 if you have the <machine/bswap.h> header file. */
-#undef HAVE_MACHINE_BSWAP_H
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mkdtemp' function. */