Get rid of acconfig.h.

7 files changed, 192 insertions, 213 deletions

diff --git a/Makefile-devel-adds b/Makefile-devel-adds
index d377f531..d629bb62 100644
--- a/Makefile-devel-adds
+++ b/Makefile-devel-adds
@@ -7,7 +7,7 @@ ${srcdir}/configure: configure.in aclocal.m4
 
 # autoheader might not change config.h.in, so touch a stamp file.
 ${srcdir}/config.h.in: ${srcdir}/stamp-h.in
-${srcdir}/stamp-h.in: configure.in acconfig.h
+${srcdir}/stamp-h.in: configure.in
 	cd ${srcdir} && autoheader
 	echo timestamp > ${srcdir}/stamp-h.in
 
diff --git a/Makefile.in b/Makefile.in
index 230aa35c..b91e3507 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,7 +112,6 @@ SRC =	$(CSRC) $(GENSRC) $(LOCALSRC) $(LIBNETDISSECT_SRC)
 # hack the extra indirection
 OBJ =	$(CSRC:.c=.o) $(GENSRC:.c=.o) $(LOCALSRC:.c=.o) $(LIBOBJS) $(LIBNETDISSECT_OBJ)
 HDR = \
-	acconfig.h \
 	addrtoname.h \
 	af.h \
 	ah.h \
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 9eb54f8b..00000000
--- a/acconfig.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* "generated automatically" means DO NOT MAKE CHANGES TO config.h.in --
- * make them to acconfig.h and rerun autoheader */
-@TOP@
-
-/* Define if you enable IPv6 support */
-#undef INET6
-
-/* Define if you enable support for the libsmi. */
-#undef LIBSMI
-
-/* define if you have the addrinfo function. */
-#undef HAVE_ADDRINFO
-
-/* define if you need to include missing/addrinfoh.h. */
-#undef NEED_ADDRINFO_H
-
-/* define ifyou have the h_errno variable. */
-#undef HAVE_H_ERRNO
-
-/* define if you have struct sockaddr_storage */
-#undef HAVE_SOCKADDR_STORAGE
-
-/* define if you have both getipnodebyname() and getipnodebyaddr() */
-#undef USE_GETIPNODEBY
-
-/* define if you have ether_ntohost() and it works */
-#undef USE_ETHER_NTOHOST
-
-/* define if libpcap has pcap_version */
-#undef HAVE_PCAP_VERSION
-
-/* define if libpcap has pcap_debug */
-#undef HAVE_PCAP_DEBUG
-
-/* define if libpcap has yydebug */
-#undef HAVE_YYDEBUG
-
-/* define if libpcap has pcap_list_datalinks() */
-#undef HAVE_PCAP_LIST_DATALINKS
-
-/* define if libpcap has pcap_set_datalink() */
-#undef HAVE_PCAP_SET_DATALINK
-
-/* define if libpcap has pcap_datalink_name_to_val() */
-#undef HAVE_PCAP_DATALINK_NAME_TO_VAL
-
-/* define if libpcap has pcap_datalink_val_to_description() */
-#undef HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION
-
-/* define if libpcap has pcap_dump_ftell() */
-#undef HAVE_PCAP_DUMP_FTELL
-
-/* define if you have getrpcbynumber() */
-#undef HAVE_GETRPCBYNUMBER
-
-/* Workaround for missing 64-bit formats */
-#undef PRId64
-#undef PRIo64
-#undef PRIx64
-#undef PRIu64
-
-/* Whether or not to include the possibly-buggy SMB printer */
-#undef TCPDUMP_DO_SMB
-
-/* Define if you have the dnet_htoa function.  */
-#undef HAVE_DNET_HTOA
-
-/* Define if you have a dnet_htoa declaration in <netdnet/dnetdb.h>.  */
-#undef HAVE_NETDNET_DNETDB_H_DNET_HTOA
-
-/* define if should drop privileges by default */
-#undef WITH_USER
-
-/* define if should chroot when dropping privileges */
-#undef WITH_CHROOT
diff --git a/aclocal.m4 b/aclocal.m4
index 558eb6bc..36807483 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -601,17 +601,21 @@ reproduce this problem ourselves.])
     dnl if they're not present.
     dnl
     AC_CHECK_FUNC(pcap_list_datalinks,
-	AC_DEFINE(HAVE_PCAP_LIST_DATALINKS),
+	AC_DEFINE(HAVE_PCAP_LIST_DATALINKS, 1,
+	    [define if libpcap has pcap_list_datalinks()]),
 	[
 	    AC_LIBOBJ(datalinks)
 	])
     AC_CHECK_FUNC(pcap_set_datalink,
-	AC_DEFINE(HAVE_PCAP_SET_DATALINK))
+	AC_DEFINE(HAVE_PCAP_SET_DATALINK, 1,
+	    [define if libpcap has pcap_set_datalink()]))
     AC_CHECK_FUNC(pcap_datalink_name_to_val,
 	[
-	    AC_DEFINE(HAVE_PCAP_DATALINK_NAME_TO_VAL)
+	    AC_DEFINE(HAVE_PCAP_DATALINK_NAME_TO_VAL, 1,
+		[define if libpcap has pcap_datalink_name_to_val()])
 	    AC_CHECK_FUNC(pcap_datalink_val_to_description,
-		AC_DEFINE(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION),
+		AC_DEFINE(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION, 1,
+		    [define if libpcap has pcap_datalink_val_to_description()]),
 		[
 		    AC_LIBOBJ(dlnames)
 		])
@@ -631,7 +635,8 @@ reproduce this problem ourselves.])
     dnl Check for "pcap_dump_ftell()" and use a substitute version
     dnl if it's not present.
     AC_CHECK_FUNC(pcap_dump_ftell,
-	AC_DEFINE(HAVE_PCAP_DUMP_FTELL),
+	AC_DEFINE(HAVE_PCAP_DUMP_FTELL, 1,
+	    [define if libpcap has pcap_dump_ftell()]),
 	[
 	    AC_LIBOBJ(pcap_dump_ftell)
 	])
@@ -819,10 +824,10 @@ AC_DEFUN(AC_LBL_CHECK_64BIT_FORMAT,
 	  ]])
       ],
       [
-	AC_DEFINE(PRId64, "$1d")
-	AC_DEFINE(PRIo64, "$1o")
-	AC_DEFINE(PRIx64, "$1x")
-	AC_DEFINE(PRIu64, "$1u")
+	AC_DEFINE(PRId64, "$1d", [define if the platform doesn't define PRId64])
+	AC_DEFINE(PRIo64, "$1o", [define if the platform doesn't define PRIo64])
+	AC_DEFINE(PRIx64, "$1x", [define if the platform doesn't define PRIu64])
+	AC_DEFINE(PRIu64, "$1u", [define if the platform doesn't define PRIx64])
 	AC_MSG_RESULT(yes)
       ],
       [
@@ -1192,9 +1197,11 @@ AC_DEFUN(AC_STRUCT_ADDRINFO, [
 		$1=no))
 	AC_MSG_RESULT($$1)
 	if test $$1 = yes; then
-		AC_DEFINE(HAVE_ADDRINFO)
+		AC_DEFINE(HAVE_ADDRINFO, 1,
+		    [define if you have the addrinfo function])
 	else
-		AC_DEFINE(NEED_ADDRINFO_H)
+		AC_DEFINE(NEED_ADDRINFO_H, 1,
+		    [define if you need to include missing/addrinfo.h])
 	fi
 ])
 
@@ -1245,7 +1252,8 @@ AC_DEFUN(AC_STRUCT_SA_STORAGE, [
 		$1=no))
 	AC_MSG_RESULT($$1)
 	if test $$1 = yes; then
-		AC_DEFINE(HAVE_SOCKADDR_STORAGE)
+		AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1,
+		    [define if you have struct sockaddr_storage])
 	fi
 ])
 
@@ -1262,7 +1270,8 @@ AC_DEFUN(AC_VAR_H_ERRNO, [
 		ac_cv_var_h_errno=no))
 	AC_MSG_RESULT($ac_cv_var_h_errno)
 	if test "$ac_cv_var_h_errno" = "yes"; then
-		AC_DEFINE(HAVE_H_ERRNO)
+		AC_DEFINE(HAVE_H_ERRNO, 1,
+		    [define if you have the h_errno variable])
 	fi
 ])
 
diff --git a/config.h.in b/config.h.in
index e206621c..4c48e6fb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,79 +1,8 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
-/* "generated automatically" means DO NOT MAKE CHANGES TO config.h.in --
- * make them to acconfig.h and rerun autoheader */
 
-/* Define if you enable IPv6 support */
-#undef INET6
-
-/* Define if you enable support for the libsmi. */
-#undef LIBSMI
-
-/* define if you have the addrinfo function. */
+/* define if you have the addrinfo function */
 #undef HAVE_ADDRINFO
 
-/* define if you need to include missing/addrinfoh.h. */
-#undef NEED_ADDRINFO_H
-
-/* define ifyou have the h_errno variable. */
-#undef HAVE_H_ERRNO
-
-/* define if you have struct sockaddr_storage */
-#undef HAVE_SOCKADDR_STORAGE
-
-/* define if you have both getipnodebyname() and getipnodebyaddr() */
-#undef USE_GETIPNODEBY
-
-/* define if you have ether_ntohost() and it works */
-#undef USE_ETHER_NTOHOST
-
-/* define if libpcap has pcap_version */
-#undef HAVE_PCAP_VERSION
-
-/* define if libpcap has pcap_debug */
-#undef HAVE_PCAP_DEBUG
-
-/* define if libpcap has yydebug */
-#undef HAVE_YYDEBUG
-
-/* define if libpcap has pcap_list_datalinks() */
-#undef HAVE_PCAP_LIST_DATALINKS
-
-/* define if libpcap has pcap_set_datalink() */
-#undef HAVE_PCAP_SET_DATALINK
-
-/* define if libpcap has pcap_datalink_name_to_val() */
-#undef HAVE_PCAP_DATALINK_NAME_TO_VAL
-
-/* define if libpcap has pcap_datalink_val_to_description() */
-#undef HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION
-
-/* define if libpcap has pcap_dump_ftell() */
-#undef HAVE_PCAP_DUMP_FTELL
-
-/* define if you have getrpcbynumber() */
-#undef HAVE_GETRPCBYNUMBER
-
-/* Workaround for missing 64-bit formats */
-#undef PRId64
-#undef PRIo64
-#undef PRIx64
-#undef PRIu64
-
-/* Whether or not to include the possibly-buggy SMB printer */
-#undef TCPDUMP_DO_SMB
-
-/* Define if you have the dnet_htoa function.  */
-#undef HAVE_DNET_HTOA
-
-/* Define if you have a dnet_htoa declaration in <netdnet/dnetdb.h>.  */
-#undef HAVE_NETDNET_DNETDB_H_DNET_HTOA
-
-/* define if should drop privileges by default */
-#undef WITH_USER
-
-/* define if should chroot when dropping privileges */
-#undef WITH_CHROOT
-
 /* Define to 1 if you have the `alarm' function. */
 #undef HAVE_ALARM
 
@@ -84,6 +13,9 @@
    don't. */
 #undef HAVE_DECL_ETHER_NTOHOST
 
+/* define if you have the dnet_htoa function */
+#undef HAVE_DNET_HTOA
+
 /* Define to 1 if you have the `ether_ntohost' function. */
 #undef HAVE_ETHER_NTOHOST
 
@@ -96,6 +28,12 @@
 /* Define to 1 if you have the `getnameinfo' function. */
 #undef HAVE_GETNAMEINFO
 
+/* define if you have getrpcbynumber() */
+#undef HAVE_GETRPCBYNUMBER
+
+/* define if you have the h_errno variable */
+#undef HAVE_H_ERRNO
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -114,6 +52,9 @@
 /* Define to 1 if you have the <netdnet/dnetdb.h> header file. */
 #undef HAVE_NETDNET_DNETDB_H
 
+/* define if you have a dnet_htoa declaration in <netdnet/dnetdb.h> */
+#undef HAVE_NETDNET_DNETDB_H_DNET_HTOA
+
 /* Define to 1 if you have the <netinet/ether.h> header file. */
 #undef HAVE_NETINET_ETHER_H
 
@@ -138,9 +79,21 @@
 /* Define to 1 if you have the `pcap_create' function. */
 #undef HAVE_PCAP_CREATE
 
+/* define if libpcap has pcap_datalink_name_to_val() */
+#undef HAVE_PCAP_DATALINK_NAME_TO_VAL
+
+/* define if libpcap has pcap_datalink_val_to_description() */
+#undef HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION
+
+/* define if libpcap has pcap_debug */
+#undef HAVE_PCAP_DEBUG
+
 /* Define to 1 if you have the `pcap_dump_flush' function. */
 #undef HAVE_PCAP_DUMP_FLUSH
 
+/* define if libpcap has pcap_dump_ftell() */
+#undef HAVE_PCAP_DUMP_FTELL
+
 /* Define to 1 if you have the `pcap_findalldevs' function. */
 #undef HAVE_PCAP_FINDALLDEVS
 
@@ -150,12 +103,21 @@
 /* Define to 1 if you have the `pcap_lib_version' function. */
 #undef HAVE_PCAP_LIB_VERSION
 
+/* define if libpcap has pcap_list_datalinks() */
+#undef HAVE_PCAP_LIST_DATALINKS
+
+/* define if libpcap has pcap_set_datalink() */
+#undef HAVE_PCAP_SET_DATALINK
+
 /* Define to 1 if you have the `pcap_set_tstamp_type' function. */
 #undef HAVE_PCAP_SET_TSTAMP_TYPE
 
 /* Define to 1 if you have the <pcap/usb.h> header file. */
 #undef HAVE_PCAP_USB_H
 
+/* define if libpcap has pcap_version */
+#undef HAVE_PCAP_VERSION
+
 /* Define to 1 if you have the `pfopen' function. */
 #undef HAVE_PFOPEN
 
@@ -183,6 +145,9 @@
 /* if struct sockaddr has the sa_len member */
 #undef HAVE_SOCKADDR_SA_LEN
 
+/* define if you have struct sockaddr_storage */
+#undef HAVE_SOCKADDR_STORAGE
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -237,12 +202,24 @@
 /* Define to 1 if you have the `vsnprintf' function. */
 #undef HAVE_VSNPRINTF
 
+/* define if libpcap has yydebug */
+#undef HAVE_YYDEBUG
+
 /* define if your compiler has __attribute__ */
 #undef HAVE___ATTRIBUTE__
 
+/* Define if you enable IPv6 support */
+#undef INET6
+
 /* if unaligned access fails */
 #undef LBL_ALIGN
 
+/* Define if you enable support for libsmi */
+#undef LIBSMI
+
+/* define if you need to include missing/addrinfo.h */
+#undef NEED_ADDRINFO_H
+
 /* Define to 1 if netinet/ether.h declares `ether_ntohost' */
 #undef NETINET_ETHER_H_DECLARES_ETHER_NTOHOST
 
@@ -264,6 +241,18 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* define if the platform doesn't define PRId64 */
+#undef PRId64
+
+/* define if the platform doesn't define PRIo64 */
+#undef PRIo64
+
+/* define if the platform doesn't define PRIx64 */
+#undef PRIu64
+
+/* define if the platform doesn't define PRIu64 */
+#undef PRIx64
+
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
 
@@ -273,9 +262,21 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* define if you want to build the possibly-buggy SMB printer */
+#undef TCPDUMP_DO_SMB
+
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
+/* define if you have ether_ntohost() and it works */
+#undef USE_ETHER_NTOHOST
+
+/* define if should chroot when dropping privileges */
+#undef WITH_CHROOT
+
+/* define if should drop privileges by default */
+#undef WITH_USER
+
 /* get BSD semantics on Irix */
 #undef _BSD_SIGNALS
 
diff --git a/configure b/configure
index eb404673..e10dcd4d 100755
--- a/configure
+++ b/configure
@@ -4573,7 +4573,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (exit $ac_status); }; }; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define LIBSMI 1
 _ACEOF
 
@@ -4619,7 +4620,8 @@ yes)	{ echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 	{ echo "$as_me:$LINENO: WARNING: The SMB printer may have exploitable buffer overflows!!!" >&5
 echo "$as_me: WARNING: The SMB printer may have exploitable buffer overflows!!!" >&2;}
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define TCPDUMP_DO_SMB 1
 _ACEOF
 
@@ -4639,7 +4641,8 @@ fi
 { echo "$as_me:$LINENO: checking whether to drop root privileges by default" >&5
 echo $ECHO_N "checking whether to drop root privileges by default... $ECHO_C" >&6; }
 if test ! -z "$with_user" ; then
-        cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define WITH_USER "$withval"
 _ACEOF
 
@@ -4659,7 +4662,8 @@ fi
 { echo "$as_me:$LINENO: checking whether to chroot" >&5
 echo $ECHO_N "checking whether to chroot... $ECHO_C" >&6; }
 if test ! -z "$with_chroot" && test "$with_chroot" != "no" ; then
-        cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define WITH_CHROOT "$withval"
 _ACEOF
 
@@ -5076,7 +5080,8 @@ if test "${enable_ipv6+set}" = set; then
 yes)   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
        LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
-       cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define INET6 1
 _ACEOF
 
@@ -5136,7 +5141,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
   LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define INET6 1
 _ACEOF
 
@@ -5729,7 +5735,8 @@ fi
 { echo "$as_me:$LINENO: result: $td_cv_decl_netdnet_dnetdb_h_dnet_htoa" >&5
 echo "${ECHO_T}$td_cv_decl_netdnet_dnetdb_h_dnet_htoa" >&6; }
 if test "$td_cv_decl_netdnet_dnetdb_h_dnet_htoa" = yes; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_NETDNET_DNETDB_H_DNET_HTOA 1
 _ACEOF
 
@@ -5788,12 +5795,14 @@ fi
 	{ echo "$as_me:$LINENO: result: $ac_cv_addrinfo" >&5
 echo "${ECHO_T}$ac_cv_addrinfo" >&6; }
 	if test $ac_cv_addrinfo = yes; then
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_ADDRINFO 1
 _ACEOF
 
 	else
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define NEED_ADDRINFO_H 1
 _ACEOF
 
@@ -5937,7 +5946,8 @@ fi
 	{ echo "$as_me:$LINENO: result: $ac_cv_sa_storage" >&5
 echo "${ECHO_T}$ac_cv_sa_storage" >&6; }
 	if test $ac_cv_sa_storage = yes; then
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_SOCKADDR_STORAGE 1
 _ACEOF
 
@@ -6708,7 +6718,8 @@ echo "${ECHO_T}$ac_cv_search_dnet_htoa" >&6; }
 ac_res=$ac_cv_search_dnet_htoa
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_DNET_HTOA 1
 _ACEOF
 
@@ -6860,7 +6871,8 @@ echo "${ECHO_T}$ac_cv_search_getrpcbynumber" >&6; }
 ac_res=$ac_cv_search_getrpcbynumber
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_GETRPCBYNUMBER 1
 _ACEOF
 
@@ -7500,7 +7512,8 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_pcap_list_datalinks" >&5
 echo "${ECHO_T}$ac_cv_func_pcap_list_datalinks" >&6; }
 if test $ac_cv_func_pcap_list_datalinks = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PCAP_LIST_DATALINKS 1
 _ACEOF
 
@@ -7597,7 +7610,8 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_pcap_set_datalink" >&5
 echo "${ECHO_T}$ac_cv_func_pcap_set_datalink" >&6; }
 if test $ac_cv_func_pcap_set_datalink = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PCAP_SET_DATALINK 1
 _ACEOF
 
@@ -7686,7 +7700,8 @@ fi
 echo "${ECHO_T}$ac_cv_func_pcap_datalink_name_to_val" >&6; }
 if test $ac_cv_func_pcap_datalink_name_to_val = yes; then
 
-	    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PCAP_DATALINK_NAME_TO_VAL 1
 _ACEOF
 
@@ -7772,7 +7787,8 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_pcap_datalink_val_to_description" >&5
 echo "${ECHO_T}$ac_cv_func_pcap_datalink_val_to_description" >&6; }
 if test $ac_cv_func_pcap_datalink_val_to_description = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1
 _ACEOF
 
@@ -7977,7 +7993,8 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_pcap_dump_ftell" >&5
 echo "${ECHO_T}$ac_cv_func_pcap_dump_ftell" >&6; }
 if test $ac_cv_func_pcap_dump_ftell = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PCAP_DUMP_FTELL 1
 _ACEOF
 
@@ -8351,7 +8368,8 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_buggy_ether_ntohost" >&5
 echo "${ECHO_T}$ac_cv_buggy_ether_ntohost" >&6; }
     if test "$ac_cv_buggy_ether_ntohost" = "no"; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_ETHER_NTOHOST 1
 _ACEOF
 
@@ -9307,7 +9325,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     if test "$ac_lbl_cv_pcap_version_defined" = yes ; then
     	{ echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PCAP_VERSION 1
 _ACEOF
 
@@ -9368,7 +9387,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 if test "$ac_lbl_cv_pcap_debug_defined" = yes ; then
 	{ echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PCAP_DEBUG 1
 _ACEOF
 
@@ -9430,7 +9450,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 	if test "$ac_lbl_cv_yydebug_defined" = yes ; then
 		{ echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_YYDEBUG 1
 _ACEOF
 
@@ -10561,19 +10582,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRId64 "ld"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIo64 "lo"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIx64 "lx"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIu64 "lu"
 _ACEOF
 
@@ -10651,19 +10676,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRId64 "lld"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIo64 "llo"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIx64 "llx"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIu64 "llu"
 _ACEOF
 
@@ -10741,19 +10770,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRId64 "Ld"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIo64 "Lo"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIx64 "Lx"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIu64 "Lu"
 _ACEOF
 
@@ -10831,19 +10864,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRId64 "qd"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIo64 "qo"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIx64 "qx"
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define PRIu64 "qu"
 _ACEOF
 
@@ -11878,7 +11915,8 @@ fi
 	{ echo "$as_me:$LINENO: result: $ac_cv_var_h_errno" >&5
 echo "${ECHO_T}$ac_cv_var_h_errno" >&6; }
 	if test "$ac_cv_var_h_errno" = "yes"; then
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_H_ERRNO 1
 _ACEOF
 
diff --git a/configure.in b/configure.in
index 3e63375e..570fd581 100644
--- a/configure.in
+++ b/configure.in
@@ -140,7 +140,7 @@ main()
 }
 ],
 [ AC_MSG_RESULT(yes)
-  AC_DEFINE(LIBSMI)
+  AC_DEFINE(LIBSMI, 1, [Define if you enable support for libsmi])
   libsmi=yes],
 dnl autoconf documentation says that $? contains the exit value.
 dnl reality is that it does not.  We leave this in just in case
@@ -167,7 +167,8 @@ AC_ARG_ENABLE(smb,
 case "$enableval" in
 yes)	AC_MSG_RESULT(yes)
 	AC_WARN([The SMB printer may have exploitable buffer overflows!!!])
-	AC_DEFINE(TCPDUMP_DO_SMB)
+	AC_DEFINE(TCPDUMP_DO_SMB, 1,
+	    [define if you want to build the possibly-buggy SMB printer])
 	LOCALSRC="print-smb.c smbutil.c $LOCALSRC"
 	;;
 *)	AC_MSG_RESULT(no)
@@ -177,7 +178,8 @@ esac
 AC_ARG_WITH(user, [  --with-user=USERNAME    drop privileges by default to USERNAME])
 AC_MSG_CHECKING([whether to drop root privileges by default])
 if test ! -z "$with_user" ; then
-        AC_DEFINE_UNQUOTED(WITH_USER, "$withval")
+       AC_DEFINE_UNQUOTED(WITH_USER, "$withval",
+           [define if should drop privileges by default])
        AC_MSG_RESULT(to \"$withval\")
 else
        AC_MSG_RESULT(no)
@@ -186,7 +188,8 @@ fi
 AC_ARG_WITH(chroot, [  --with-chroot=DIRECTORY when dropping privileges, chroot to DIRECTORY])
 AC_MSG_CHECKING([whether to chroot])
 if test ! -z "$with_chroot" && test "$with_chroot" != "no" ; then
-        AC_DEFINE_UNQUOTED(WITH_CHROOT, "$withval")
+       AC_DEFINE_UNQUOTED(WITH_CHROOT, "$withval",
+           [define if should chroot when dropping privileges])
        AC_MSG_RESULT(to \"$withval\")
 else
        AC_MSG_RESULT(no)
@@ -206,7 +209,7 @@ AC_ARG_ENABLE(ipv6,
 [ case "$enableval" in
 yes)   AC_MSG_RESULT(yes)
        LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
-       AC_DEFINE(INET6)
+       AC_DEFINE(INET6, 1, [Define if you enable IPv6 support])
        ipv6=yes
        ;;
 *)
@@ -228,7 +231,7 @@ main()
 ],
 [ AC_MSG_RESULT(yes)
   LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
-  AC_DEFINE(INET6)
+  AC_DEFINE(INET6, 1, [Define if you enable IPv6 support])
   ipv6=yes],
 [ AC_MSG_RESULT(no)
   ipv6=no],
@@ -497,7 +500,8 @@ AC_CACHE_CHECK([for dnet_htoa declaration in netdnet/dnetdb.h],
 	td_cv_decl_netdnet_dnetdb_h_dnet_htoa=yes,
 	td_cv_decl_netdnet_dnetdb_h_dnet_htoa=no)])
 if test "$td_cv_decl_netdnet_dnetdb_h_dnet_htoa" = yes; then
-	AC_DEFINE(HAVE_NETDNET_DNETDB_H_DNET_HTOA)
+	AC_DEFINE(HAVE_NETDNET_DNETDB_H_DNET_HTOA, 1,
+	    [define if you have a dnet_htoa declaration in <netdnet/dnetdb.h>])
 fi
 
 dnl
@@ -541,12 +545,14 @@ fi
 
 AC_LBL_TYPE_SIGNAL
 
-AC_SEARCH_LIBS(dnet_htoa, dnet, AC_DEFINE(HAVE_DNET_HTOA))
+AC_SEARCH_LIBS(dnet_htoa, dnet,
+    AC_DEFINE(HAVE_DNET_HTOA, 1, [define if you have the dnet_htoa function]))
 
 AC_CHECK_LIB(rpc, main)		dnl It's unclear why we might need -lrpc
 
 dnl Some platforms may need -lnsl for getrpcbynumber.
-AC_SEARCH_LIBS(getrpcbynumber, nsl, AC_DEFINE(HAVE_GETRPCBYNUMBER))
+AC_SEARCH_LIBS(getrpcbynumber, nsl,
+    AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()]))
 
 dnl AC_CHECK_LIB(z, uncompress)
 dnl AC_CHECK_HEADERS(zlib.h)
@@ -625,7 +631,8 @@ AC_CHECK_FUNCS(ether_ntohost, [
 	   [ac_cv_buggy_ether_ntohost=yes],
 	   [ac_cv_buggy_ether_ntohost="not while cross-compiling"])])
     if test "$ac_cv_buggy_ether_ntohost" = "no"; then
-	AC_DEFINE(USE_ETHER_NTOHOST)
+	AC_DEFINE(USE_ETHER_NTOHOST, 1,
+	    [define if you have ether_ntohost() and it works])
     fi
 ])
 if test "$ac_cv_func_ether_ntohost" = yes -a \
@@ -756,7 +763,7 @@ if test $ac_cv_func_pcap_lib_version = "no" ; then
        ac_lbl_cv_pcap_version_defined=no)
     if test "$ac_lbl_cv_pcap_version_defined" = yes ; then
     	AC_MSG_RESULT(yes)
-	AC_DEFINE(HAVE_PCAP_VERSION)
+	AC_DEFINE(HAVE_PCAP_VERSION, 1, [define if libpcap has pcap_version])
     else
 	AC_MSG_RESULT(no)
     fi
@@ -772,7 +779,7 @@ AC_TRY_LINK([],
    ac_lbl_cv_pcap_debug_defined=no)
 if test "$ac_lbl_cv_pcap_debug_defined" = yes ; then
 	AC_MSG_RESULT(yes)
-	AC_DEFINE(HAVE_PCAP_DEBUG)
+	AC_DEFINE(HAVE_PCAP_DEBUG, 1, [define if libpcap has pcap_debug])
 else
 	AC_MSG_RESULT(no)
 	#
@@ -789,7 +796,7 @@ else
 	   ac_lbl_cv_yydebug_defined=no)
 	if test "$ac_lbl_cv_yydebug_defined" = yes ; then
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_YYDEBUG)
+		AC_DEFINE(HAVE_YYDEBUG, 1, [define if libpcap has yydebug])
 	else
 		AC_MSG_RESULT(no)
 	fi