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

configure: special-case macOS /usr/bin/pcap-config as we do in CMake.

Browse Source 
macOS's /usr/bin/pcap-config is incorrectly generated - pcap-config
--cflags includes -I/usr/local/include and pcap-config --libs includes
-L/usr/local/lib, even though it's the pcap-config file for the libpcap
that comes with the OS and should omit those.
This commit is contained in:
Guy Harris 2021-08-03 12:58:34 -07:00
parent 66e1377aa1
commit fc240c64fb
2 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
aclocal.m4 vendored
View File

@ -575,6 +575,32 @@ AC_DEFUN(AC_LBL_LIBPCAP,
# Found - use it to get the include flags for
# libpcap and the flags to link with libpcap.
#
# If this is a system-supplied pcap-config, which
# we define as being "a pcap-config in /usr/bin",
# there are some issues. Work around them.
#
if test "$PCAP_CONFIG" = "/usr/bin/pcap-config" ; then
#
# It's /usr/bin/pcap-config.
#
case "$host_os" in
darwin*)
#
# This is macOS or another Darwin-based OS.
#
# That means that /usr/bin/pcap-config it
# may provide -I/usr/local/include with --cflags
# and -L/usr/local/lib with --libs, rather than
# pointing to the OS-supplied library and
# Xcode-supplied headers. Remember that, so we
# ignore those values.
#
_broken_apple_pcap_config=yes
;;
esac
fi
#
# Please read section 11.6 "Shell Substitutions"
# in the autoconf manual before doing anything
# to this that involves quoting. Especially note
@ -583,8 +609,30 @@ AC_DEFUN(AC_LBL_LIBPCAP,
# expressions (pfew!)."
#
cflags=`"$PCAP_CONFIG" --cflags`
#
# Work around macOS (and probably other Darwin) brokenness,
# by not adding /usr/local/include if it's from the broken
# Apple pcap-config.
#
if test "$_broken_apple_pcap_config" = "yes" ; then
#
# Strip -I/usr/local/include with sed.
#
cflags=`echo $cflags | sed 's;-I/usr/local/include;;'`
fi
$2="$cflags $$2"
libpcap=`"$PCAP_CONFIG" --libs`
#
# Work around macOS (and probably other Darwin) brokenness,
# by not adding /usr/local/lib if it's from the broken
# Apple pcap-config.
#
if test "$_broken_apple_pcap_config" = "yes" ; then
#
# Strip -L/usr/local/lib with sed.
#
libpcap=`echo $libpcap | sed 's;-L/usr/local/lib;;'`
fi
else
#
# Not found; look for an installed pcap.

48
configure vendored
View File

@ -5489,6 +5489,32 @@ fi
# Found - use it to get the include flags for
# libpcap and the flags to link with libpcap.
#
# If this is a system-supplied pcap-config, which
# we define as being "a pcap-config in /usr/bin",
# there are some issues. Work around them.
#
if test "$PCAP_CONFIG" = "/usr/bin/pcap-config" ; then
#
# It's /usr/bin/pcap-config.
#
case "$host_os" in
darwin*)
#
# This is macOS or another Darwin-based OS.
#
# That means that /usr/bin/pcap-config it
# may provide -I/usr/local/include with --cflags
# and -L/usr/local/lib with --libs, rather than
# pointing to the OS-supplied library and
# Xcode-supplied headers. Remember that, so we
# ignore those values.
#
_broken_apple_pcap_config=yes
;;
esac
fi
#
# Please read section 11.6 "Shell Substitutions"
# in the autoconf manual before doing anything
# to this that involves quoting. Especially note
@ -5497,8 +5523,30 @@ fi
# expressions (pfew!)."
#
cflags=`"$PCAP_CONFIG" --cflags`
#
# Work around macOS (and probably other Darwin) brokenness,
# by not adding /usr/local/include if it's from the broken
# Apple pcap-config.
#
if test "$_broken_apple_pcap_config" = "yes" ; then
#
# Strip -I/usr/local/include with sed.
#
cflags=`echo $cflags | sed 's;-I/usr/local/include;;'`
fi
V_INCLS="$cflags $V_INCLS"
libpcap=`"$PCAP_CONFIG" --libs`
#
# Work around macOS (and probably other Darwin) brokenness,
# by not adding /usr/local/lib if it's from the broken
# Apple pcap-config.
#
if test "$_broken_apple_pcap_config" = "yes" ; then
#
# Strip -L/usr/local/lib with sed.
#
libpcap=`echo $libpcap | sed 's;-L/usr/local/lib;;'`
fi
else
#
# Not found; look for an installed pcap.