diff options
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 4 |
2 files changed, 3 insertions, 7 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 diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 9e29881618..fe4018f094 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -80,9 +80,7 @@ check_function_exists( "pcap_setsampling" HAVE_PCAP_SETSAMPLING ) check_function_exists( "pcap_set_tstamp_precision" HAVE_PCAP_SET_TSTAMP_PRECISION ) # Remote pcap checks check_function_exists( "pcap_open" HAVE_PCAP_OPEN ) -check_function_exists( "pcap_findalldevs_ex" H_FINDALLDEVS_EX ) -check_function_exists( "pcap_createsrcstr" H_CREATESRCSTR ) -if( HAVE_PCAP_OPEN AND H_FINDALLDEVS_EX AND H_CREATESRCSTR ) +if( HAVE_PCAP_OPEN ) set( HAVE_PCAP_REMOTE 1 ) set( HAVE_REMOTE 1 ) endif() |