From: guy <guy>
Date: Sun, 24 Apr 2005 01:26:27 +0000 (+0000)
Subject: Albert Chin's patch to libpcap's configure.in:
X-Git-Tag: tcpdump-3.9.1~108
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/1c3d5f6915d2a93785c17e4ba14e6b72fa37fdd1

Albert Chin's patch to libpcap's configure.in:

	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.

is required for tcpdump's configure.in as well.
---

diff --git a/configure b/configure
index 38a753a9..059697c4 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.188.2.4 .
+# From configure.in Revision: 1.188.2.5 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -9153,26 +9153,14 @@ echo "$as_me:$LINENO: result: $ac_cv_have_decl_ether_ntohost" >&5
 echo "${ECHO_T}$ac_cv_have_decl_ether_ntohost" >&6
 if test $ac_cv_have_decl_ether_ntohost = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ETHER_NTOHOST 1
-_ACEOF
-
-
 
 cat >>confdefs.h <<\_ACEOF
 #define NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST
 _ACEOF
 
 
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ETHER_NTOHOST 0
-_ACEOF
-
-
 fi
 
-
 	fi
 	#
 	# Did that succeed?
@@ -9383,26 +9371,14 @@ echo "$as_me:$LINENO: result: $ac_cv_have_decl_ether_ntohost" >&5
 echo "${ECHO_T}$ac_cv_have_decl_ether_ntohost" >&6
 if test $ac_cv_have_decl_ether_ntohost = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ETHER_NTOHOST 1
-_ACEOF
-
-
 
 cat >>confdefs.h <<\_ACEOF
 #define NETINET_ETHER_H_DECLARES_ETHER_NTOHOST
 _ACEOF
 
 
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ETHER_NTOHOST 0
-_ACEOF
-
-
 fi
 
-
 		fi
 	fi
 	#
@@ -9479,6 +9455,17 @@ _ACEOF
 
 fi
 
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DECL_ETHER_NTOHOST 0
+_ACEOF
+
+	else
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DECL_ETHER_NTOHOST 1
+_ACEOF
+
 	fi
 fi
 
diff --git a/configure.in b/configure.in
index 8fbe2bfd..aa374549 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.188.2.4 2005-04-21 02:22:38 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.188.2.5 2005-04-24 01:26:27 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.188.2.4 $)
+AC_REVISION($Revision: 1.188.2.5 $)
 AC_PREREQ(2.50)
 AC_INIT(tcpdump.c)
 
@@ -619,7 +619,7 @@ if test "$ac_cv_func_ether_ntohost" = yes -a \
 		#
 		# Yes.  Does it declare ether_ntohost()?
 		#
-		AC_CHECK_DECLS(ether_ntohost,
+		AC_CHECK_DECL(ether_ntohost,
 		    [
 			AC_DEFINE(NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST,,
 			    [Define to 1 if netinet/if_ether.h declares `ether_ntohost'])
@@ -651,7 +651,7 @@ struct rtentry;
 			# suppress the next test.
 			#
 			unset ac_cv_have_decl_ether_ntohost
-			AC_CHECK_DECLS(ether_ntohost,
+			AC_CHECK_DECL(ether_ntohost,
 			    [
 				AC_DEFINE(NETINET_ETHER_H_DECLARES_ETHER_NTOHOST,,
 				    [Define to 1 if netinet/ether.h declares `ether_ntohost'])
@@ -680,6 +680,11 @@ struct rtentry;
 #include <net/if.h>
 #include <netinet/if_ether.h>
 		    ])
+		AC_DEFINE(HAVE_DECL_ETHER_NTOHOST, 0,
+		    [Define to 1 if you have the declaration of `ether_ntohost', and to 0 if you don't.])
+	else
+		AC_DEFINE(HAVE_DECL_ETHER_NTOHOST, 1,
+		    [Define to 1 if you have the declaration of `ether_ntohost', and to 0 if you don't.])
 	fi
 fi