|author||Guy Harris <firstname.lastname@example.org>||2017-10-14 11:55:58 -0700|
|committer||Guy Harris <email@example.com>||2017-10-14 18:59:43 +0000|
Red Hat, at one point, provided a /usr/include/pcap/pcap.h without bothering to also provide a /usr/include/pcap.h that linked to it or included it, breaking source compatibility. That's what we're working around when we search in both the top-level include directories and, if they exist, pcap subdirectories of those directories. libpcap 1.0 and later also put pcap.h in a pcap subdirectory, but also provided a pcap.h in the top-level include directory that included pcap/pcap.h, preserving source compatibility, so that's not the reason we're searching in the top-level include directories and their pcap subdirectories. Change-Id: I8f427d46ce8293d278be9005ee623cda1ea5d691 Reviewed-on: https://code.wireshark.org/review/23902 Reviewed-by: Guy Harris <firstname.lastname@example.org>
1 files changed, 2 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index a5d9642364..9522bd6e88 100644
@@ -195,7 +195,8 @@ AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
# but we may have to look for the header in a "pcap"
# subdirectory of "/usr/include" or "/usr/local/include",
# as some systems apparently put "pcap.h" in a "pcap"
- # subdirectory, and we also check "$prefix/include" - and
+ # subdirectory without also providing a "pcap.h" in the top-level
+ # include directory, and we also check "$prefix/include" - and
# "$prefix/include/pcap", in case $prefix is set to
# "/usr/include" or "/usr/local/include".