mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-27 20:14:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
guy 2005-04-24 01:25:23 +00:00
parent d0e12e2377
commit 505ddaca27
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 1.192 .
# From configure.in Revision: 1.193 .
# 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

13
configure.in
View File

@ -1,4 +1,4 @@
dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.192 2005-04-21 02:21:48 guy Exp $ (LBL)
dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.193 2005-04-24 01:25:23 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.192 $)
AC_REVISION($Revision: 1.193 $)
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