Unset ac_cv_have_decl_ether_hostton before testing whether

<netinet/ether.h> declares ether_hostton(), so the failure to find it
declared in <netinet/in_ether.h> doesn't cause us to assume we won't
find it anywhere.

Fix a typo in a comment.

diff --git a/configure b/configure
index c460462c76ca5717bec44d2f71ae1e2b66af35ab..3c706db2102357429cbecdd4dabdda318f42ea2b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.117 .
+# From configure.in Revision: 1.118 .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #


@@ -3535,7 +3535,7 @@ if test "$ac_cv_header_netinet_if_ether_h" != yes; then
        # The simple test didn't work.
        # Do we need to include <net/if.h> first?
        # Unset ac_cv_header_netinet_if_ether_h so we don't
        # The simple test didn't work.
        # Do we need to include <net/if.h> first?
        # Unset ac_cv_header_netinet_if_ether_h so we don't

-       # tread the previous failure as a cached value and
+       # treat the previous failure as a cached value and

        # suppress the next test.
        #
        { echo "$as_me:$LINENO: Rechecking with some additional includes" >&5
        # suppress the next test.
        #
        { echo "$as_me:$LINENO: Rechecking with some additional includes" >&5


@@ -4627,7 +4627,11 @@ done
                if test "$ac_cv_header_netinet_ether_h" = yes; then
                        #
                        # We have it - does it declare ether_hoston()?
                if test "$ac_cv_header_netinet_ether_h" = yes; then
                        #
                        # We have it - does it declare ether_hoston()?

+                       # Unset ac_cv_have_decl_ether_hostton so we don't
+                       # treat the previous failure as a cached value and
+                       # suppress the next test.

                        #
                        #

+                       unset ac_cv_have_decl_ether_hostton

                        echo "$as_me:$LINENO: checking whether ether_hostton is declared" >&5
 echo $ECHO_N "checking whether ether_hostton is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_ether_hostton+set}" = set; then
                        echo "$as_me:$LINENO: checking whether ether_hostton is declared" >&5
 echo $ECHO_N "checking whether ether_hostton is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_ether_hostton+set}" = set; then

diff --git a/configure.in b/configure.in
index 7544ad4b5e30f65397475a0e4c6c09d1a07e3a00..50cf4ffda270ec259310c94fce5c30c99b8bd1d8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.117 2005-03-27 02:45:03 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.118 2005-03-27 03:36:36 guy Exp $ (LBL)

 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
 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
 
 dnl Process this file with autoconf to produce a configure script.
 dnl
 

-AC_REVISION($Revision: 1.117 $)
+AC_REVISION($Revision: 1.118 $)

 AC_PREREQ(2.50)
 AC_INIT(pcap.c)
 
 AC_PREREQ(2.50)
 AC_INIT(pcap.c)
 


@@ -34,7 +34,7 @@ if test "$ac_cv_header_netinet_if_ether_h" != yes; then
        # The simple test didn't work.
        # Do we need to include <net/if.h> first?
        # Unset ac_cv_header_netinet_if_ether_h so we don't
        # The simple test didn't work.
        # Do we need to include <net/if.h> first?
        # Unset ac_cv_header_netinet_if_ether_h so we don't

-       # tread the previous failure as a cached value and
+       # treat the previous failure as a cached value and

        # suppress the next test.
        #
        AC_MSG_NOTICE([Rechecking with some additional includes])
        # suppress the next test.
        #
        AC_MSG_NOTICE([Rechecking with some additional includes])


@@ -106,7 +106,11 @@ if test "$ac_cv_func_ether_hostton" = yes; then
                if test "$ac_cv_header_netinet_ether_h" = yes; then
                        #
                        # We have it - does it declare ether_hoston()?
                if test "$ac_cv_header_netinet_ether_h" = yes; then
                        #
                        # We have it - does it declare ether_hoston()?

+                       # Unset ac_cv_have_decl_ether_hostton so we don't
+                       # treat the previous failure as a cached value and
+                       # suppress the next test.

                        #
                        #

+                       unset ac_cv_have_decl_ether_hostton

                        AC_CHECK_DECLS(ether_hostton,
                            [
                                AC_DEFINE(NETINET_ETHER_H_DECLARES_ETHER_HOSTTON,,
                        AC_CHECK_DECLS(ether_hostton,
                            [
                                AC_DEFINE(NETINET_ETHER_H_DECLARES_ETHER_HOSTTON,,