Fix a typo.

Don't bother checking whether ether_ntohost() is declared if it exists
but is buggy so we won't be using it.

diff --git a/config.h.in b/config.h.in
index bce43a05ebb6c69e3f289d1c3c4cd0ab4c73297c..a02d6b7baa1c1ea7c543ce353bbd07bcbdbd3ecb 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -280,10 +280,10 @@
 #undef HAVE___ATTRIBUTE__
 
 /* Define to 1 if netinet/ether.h declares `ether_ntohost' */
-#undef NETINET_ETHER_H_DECLARES_ETHER_ntohost
+#undef NETINET_ETHER_H_DECLARES_ETHER_NTOHOST
 
 /* Define to 1 if netinet/if_ether.h declares `ether_ntohost' */
-#undef NETINET_IF_ETHER_H_DECLARES_ETHER_ntohost
+#undef NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST
 
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT

diff --git a/configure b/configure
index feed5ba9e1c07adb38c7801947415d71892e685e..0105d2e135fd8cbfa4fb4c84dc8b7e18468fc9b3 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.184 .
+# From configure.in Revision: 1.185 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -7144,7 +7144,8 @@ _ACEOF
 fi
 done
 
-if test "$ac_cv_func_ether_ntohost" = yes; then
+if test "$ac_cv_func_ether_ntohost" = yes -a \
+    test "$ac_cv_buggy_ether_ntohost" = "no"; then
        #
        # OK, we have ether_ntohost().  Do we have <netinet/if_ether.h>?
        #
@@ -7217,7 +7218,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define NETINET_IF_ETHER_H_DECLARES_ETHER_ntohost
+#define NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST
 _ACEOF
 
 
@@ -7447,7 +7448,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define NETINET_ETHER_H_DECLARES_ETHER_ntohost
+#define NETINET_ETHER_H_DECLARES_ETHER_NTOHOST
 _ACEOF
 
 

diff --git a/configure.in b/configure.in
index 0c0661b79bf5d7f2af1d839b0210ed05e0f3d952..de514d3d3002db55e2a6d95fc5096cfd69fabfa7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.184 2005-03-27 22:38:09 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.185 2005-03-27 22:44:22 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
@@ -6,7 +6,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.184 $)
+AC_REVISION($Revision: 1.185 $)
 AC_PREREQ(2.50)
 AC_INIT(tcpdump.c)
 
@@ -548,7 +548,8 @@ AC_CHECK_FUNCS(ether_ntohost, [
        AC_DEFINE(USE_ETHER_NTOHOST)
     fi
 ])
-if test "$ac_cv_func_ether_ntohost" = yes; then
+if test "$ac_cv_func_ether_ntohost" = yes -a \
+    test "$ac_cv_buggy_ether_ntohost" = "no"; then
        #
        # OK, we have ether_ntohost().  Do we have <netinet/if_ether.h>?
        #
@@ -558,7 +559,7 @@ if test "$ac_cv_func_ether_ntohost" = yes; then
                #
                AC_CHECK_DECLS(ether_ntohost,
                    [
-                       AC_DEFINE(NETINET_IF_ETHER_H_DECLARES_ETHER_ntohost,,
+                       AC_DEFINE(NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST,,
                            [Define to 1 if netinet/if_ether.h declares `ether_ntohost'])
                    ],,
                    [
@@ -589,7 +590,7 @@ struct rtentry;
                        unset ac_cv_have_decl_ether_ntohost
                        AC_CHECK_DECLS(ether_ntohost,
                            [
-                               AC_DEFINE(NETINET_ETHER_H_DECLARES_ETHER_ntohost,,
+                               AC_DEFINE(NETINET_ETHER_H_DECLARES_ETHER_NTOHOST,,
                                    [Define to 1 if netinet/ether.h declares `ether_ntohost'])
                            ],,
                            [