diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-04 12:58:49 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-04 20:59:14 +0000 |
| commit | 5653fcedca8491829d6d6ce480e7fba13ff801d7 (patch) | |
| tree | 02c5a736c109823786d737cf1f229e7a20135ee8 /acinclude.m4 | |
| parent | 9aeb24994364c9a3a983b4aa8db4725b1213d64d (diff) | |
No *pcap should have pcap_open() without the other remote extensions.
WinPcap 3.0 introduced pcap_open(); it also introduced
pcap_findalldevs_ex() and pcap_createsrcstr(). If you're going to put
pcap_open() in libpcap, there's not much point to doing so but not also
putting pcap_findalldevs_ex() and pcap_createsrcstr() there.
(And, in the future, there'll be support for remote capturing with
pcap_create() and pcap_activate(), with no need for pcap_createsrcstr(),
and a replacement for pcap_findalldevs() and pcap_findalldevs_ex(),
which we'll also check for.)
So there's no need to check for pcap_findalldevs_ex() or
pcap_createsrcstr().
Change-Id: I9323aad20136684d05d1e909326792a2f1408887
Reviewed-on: https://code.wireshark.org/review/6311
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 47457f634b..038cfdfc47 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -638,10 +638,8 @@ AC_DEFUN([AC_WIRESHARK_PCAP_REMOTE_CHECK], LIBS="$PCAP_LIBS $SOCKET_LIBS $NSL_LIBS $LIBS" AC_DEFINE(HAVE_REMOTE, 1, [Define to 1 to enable remote capturing feature in WinPcap library]) - AC_CHECK_FUNCS(pcap_open pcap_findalldevs_ex pcap_createsrcstr) - if test $ac_cv_func_pcap_open = "yes" -a \ - $ac_cv_func_pcap_findalldevs_ex = "yes" -a \ - $ac_cv_func_pcap_createsrcstr = "yes" ; then + AC_CHECK_FUNCS(pcap_open) + if test $ac_cv_func_pcap_open = "yes" ; then AC_DEFINE(HAVE_PCAP_REMOTE, 1, [Define to 1 if you have WinPcap remote capturing support and prefer to use these new API features.]) fi |