diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-05-11 18:19:02 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-05-11 18:19:12 +0000 |
| commit | 6f1e6d24c64960bf347c1990fcca8dfdaaf44c68 (patch) | |
| tree | 59ff6aa1de70c20dde394ab1c19ea9c92b3df7d1 | |
| parent | 8cd1fd0c993df904596390ebdf350259e7c9c5fc (diff) | |
Revert "Revert "Get rid of HAVE_REMOTE.""
This reverts commit 8cd1fd0c993df904596390ebdf350259e7c9c5fc.
Making HAVE_REMOTE a config.h #define is a really horrible idea. It's *NOT* a configuration option.
Instead, HAVE_REMOTE should be defined by other mechanisms, as was done in 79eab8ca070f978415126f85b0777ab4ab02f0a2.
Change-Id: I4632b63bd73a25a27c5f4686d2baf3e0beddecb3
Reviewed-on: https://code.wireshark.org/review/21604
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 1 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 6 |
3 files changed, 2 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 11c657fd87..fcbbab8327 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -423,12 +423,10 @@ AC_DEFUN([AC_WIRESHARK_PCAP_REMOTE_CHECK], [ ac_save_LIBS="$LIBS" LIBS="$PCAP_LIBS $LIBS" - AC_DEFINE(HAVE_REMOTE, 1, [Define to 1 to enable remote - capturing feature in WinPcap library]) 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.]) + [Define to 1 if you have libpcap/WinPcap remote capturing support and prefer to use these new API features.]) fi AC_CHECK_FUNCS(pcap_setsampling) LIBS="$ac_save_LIBS" diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 85053abff4..508d46b3a7 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -89,7 +89,6 @@ if( PCAP_FOUND ) check_function_exists( "pcap_open" HAVE_PCAP_OPEN ) if( HAVE_PCAP_OPEN ) set( HAVE_PCAP_REMOTE 1 ) - set( HAVE_REMOTE 1 ) endif() cmake_pop_check_state() diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 043c6ada08..cfb01047c0 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -266,8 +266,7 @@ /* Define to 1 if you have the `pcap_open_dead' function. */ #cmakedefine HAVE_PCAP_OPEN_DEAD 1 -/* Define to 1 if you have WinPcap remote capturing support and prefer to use - these new API features. */ +/* Define to 1 if you have libpcap/WinPcap remote capturing support. */ #cmakedefine HAVE_PCAP_REMOTE 1 /* Define to 1 if you have the `pcap_set_datalink' function. */ @@ -291,9 +290,6 @@ /* Define to 1 if you have the optreset variable */ #cmakedefine HAVE_OPTRESET 1 -/* Define to 1 to enable remote capturing feature in WinPcap library */ -#cmakedefine HAVE_REMOTE 1 - /* Define if sa_len field exists in struct sockaddr */ #cmakedefine HAVE_STRUCT_SOCKADDR_SA_LEN 1 |