Add a comment to the AC_DEFINE call for const, just as we did for

libpcap; that eliminates the need to list it in acconfig.h, so get rid
of that.

diff --git a/acconfig.h b/acconfig.h
index 19af32d8838bc8d16611e21ccec400a1709cbab9..97417969a27c7744498f10adfd6571128fbff7ef 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -80,14 +80,6 @@
 /* Whether or not to include the possibly-buggy SMB printer */
 #undef TCPDUMP_DO_SMB
 
-/* Long story short: aclocal.m4 depends on autoconf 2.13
- * implementation details wrt "const"; newer versions
- * have different implementation details so for now we
- * put "const" here.  This may cause duplicate definitions
- * in config.h but that should be OK since they're the same.
- */
-#undef const
-
 /* Define if you have the dnet_htoa function.  */
 #undef HAVE_DNET_HTOA
 

diff --git a/aclocal.m4 b/aclocal.m4
index 5b609986e1b38c62e332f68adb63302f558edf4a..eda851e2a9b362b6e5ed9ef8b101ddf68b8aafcb 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -154,7 +154,8 @@ AC_DEFUN(AC_LBL_C_INIT,
                            ac_cv_lbl_cc_const_proto=no))
                    AC_MSG_RESULT($ac_cv_lbl_cc_const_proto)
                    if test $ac_cv_lbl_cc_const_proto = no ; then
-                           AC_DEFINE(const,)
+                           AC_DEFINE(const,[],
+                               [to handle Ultrix compilers that don't support const in prototypes])
                    fi
                    ;;
            esac

diff --git a/config.h.in b/config.h.in
index 27416ac3387650c0ea4c9d3beda0e5b5858cbe72..c0e762bd1674abe46883d12c6e45da975ec99571 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -80,14 +80,6 @@
 /* Whether or not to include the possibly-buggy SMB printer */
 #undef TCPDUMP_DO_SMB
 
-/* Long story short: aclocal.m4 depends on autoconf 2.13
- * implementation details wrt "const"; newer versions
- * have different implementation details so for now we
- * put "const" here.  This may cause duplicate definitions
- * in config.h but that should be OK since they're the same.
- */
-#undef const
-
 /* Define if you have the dnet_htoa function.  */
 #undef HAVE_DNET_HTOA
 
@@ -314,6 +306,9 @@
 /* needed on HP-UX */
 #undef _HPUX_SOURCE
 
+/* to handle Ultrix compilers that don't support const in prototypes */
+#undef const
+
 /* Define as token for inline if inlining supported */
 #undef inline
 

diff --git a/configure b/configure
index 0d36d512b1099026a58ca31f4519c9cc60e989f5..b0ff736dfb595f916dd1bc8dd07e94764aed41bb 100755 (executable)
--- a/configure
+++ b/configure
@@ -3043,7 +3043,8 @@ fi
                    { echo "$as_me:$LINENO: result: $ac_cv_lbl_cc_const_proto" >&5
 echo "${ECHO_T}$ac_cv_lbl_cc_const_proto" >&6; }
                    if test $ac_cv_lbl_cc_const_proto = no ; then
-                           cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define const
 _ACEOF