From Albert Chin: AC_CHECK_DECLS will define the HAVE_DECL_xxx variable

whether it succeeds or fails, so you can't erase a "no" result and try
again with a different header.  Use AC_CHECK_DECL, which doesn't define
HAVE_DECL_xxx, and then explicitly define it based on whether we found a
declaration or not.

diff --git a/configure b/configure
index 74d3b9d850d726db6abe1c16def939fc95ff6ed8..2bcd5cb4d27a4a01658477335161ba8f5b731ff0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.120.2.3 .
+# From configure.in Revision: 1.120.2.4 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -4458,26 +4458,14 @@ echo "$as_me:$LINENO: result: $ac_cv_have_decl_ether_hostton" >&5
 echo "${ECHO_T}$ac_cv_have_decl_ether_hostton" >&6
 if test $ac_cv_have_decl_ether_hostton = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ETHER_HOSTTON 1
-_ACEOF
-
-
 
 cat >>confdefs.h <<\_ACEOF
 #define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON
 _ACEOF
 
 
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ETHER_HOSTTON 0
-_ACEOF
-
-
 fi
 
-
        fi
        #
        # Did that succeed?
@@ -4688,26 +4676,14 @@ echo "$as_me:$LINENO: result: $ac_cv_have_decl_ether_hostton" >&5
 echo "${ECHO_T}$ac_cv_have_decl_ether_hostton" >&6
 if test $ac_cv_have_decl_ether_hostton = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ETHER_HOSTTON 1
-_ACEOF
-
-
 
 cat >>confdefs.h <<\_ACEOF
 #define NETINET_ETHER_H_DECLARES_ETHER_HOSTTON
 _ACEOF
 
 
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ETHER_HOSTTON 0
-_ACEOF
-
-
 fi
 
-
                fi
        fi
        #
@@ -4784,6 +4760,17 @@ _ACEOF
 
 fi
 
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DECL_ETHER_HOSTTON 0
+_ACEOF
+
+       else
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DECL_ETHER_HOSTTON 1
+_ACEOF
+
        fi
 fi
 

diff --git a/configure.in b/configure.in
index 166163507d6769a4625e0d652785fa7cb07d9509..a03b2aefce3a0aa499bc49019babfb1dc8236e20 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.120.2.3 2005-04-20 11:13:50 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.120.2.4 2005-04-23 22:43:31 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.120.2.3 $)
+AC_REVISION($Revision: 1.120.2.4 $)
 AC_PREREQ(2.50)
 AC_INIT(pcap.c)
 
@@ -84,7 +84,7 @@ if test "$ac_cv_func_ether_hostton" = yes; then
                #
                # Yes.  Does it declare ether_hostton()?
                #
-               AC_CHECK_DECLS(ether_hostton,
+               AC_CHECK_DECL(ether_hostton,
                    [
                        AC_DEFINE(NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON,,
                            [Define to 1 if netinet/if_ether.h declares `ether_hostton'])
@@ -116,7 +116,7 @@ struct rtentry;
                        # suppress the next test.
                        #
                        unset ac_cv_have_decl_ether_hostton
-                       AC_CHECK_DECLS(ether_hostton,
+                       AC_CHECK_DECL(ether_hostton,
                            [
                                AC_DEFINE(NETINET_ETHER_H_DECLARES_ETHER_HOSTTON,,
                                    [Define to 1 if netinet/ether.h declares `ether_hostton'])
@@ -145,6 +145,13 @@ struct rtentry;
 #include <net/if.h>
 #include <netinet/if_ether.h>
                    ])
+               AC_DEFINE(HAVE_DECL_ETHER_HOSTTON, 0,
+                   [Define to 1 if you have the declaration of `ether_hostton', and to 0 if you
+don't.])
+       else
+               AC_DEFINE(HAVE_DECL_ETHER_HOSTTON, 1,
+                   [Define to 1 if you have the declaration of `ether_hostton', and to 0 if you
+don't.])
        fi
 fi