From: Jörg Mayer <jmayer@loplof.de>
Date: Thu, 11 May 2017 18:02:06 +0000 (+0000)
Subject: Revert "Get rid of HAVE_REMOTE."
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=8cd1fd0c993df904596390ebdf350259e7c9c5fc;p=metze%2Fwireshark%2Fwip.git

Revert "Get rid of HAVE_REMOTE."

This reverts commit d13b8ea13cf708a7770e7f51912ce16d0b43e459.

This will only work with git HEAD of libpcap, but not with any release versions of libpcap or winpcap (the *pcap includes require the define, not Wireshark).

Change-Id: I08e5ec66e3642dc02f793c83ffc4363bb348202c
Reviewed-on: https://code.wireshark.org/review/21603
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
---

diff --git a/acinclude.m4 b/acinclude.m4
index fcbbab8327..11c657fd87 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -423,10 +423,12 @@ 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 libpcap/WinPcap remote capturing support and prefer to use these new API features.])
+            [Define to 1 if you have 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 508d46b3a7..85053abff4 100644
--- a/cmake/modules/FindPCAP.cmake
+++ b/cmake/modules/FindPCAP.cmake
@@ -89,6 +89,7 @@ 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 cfb01047c0..043c6ada08 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -266,7 +266,8 @@
 /* Define to 1 if you have the `pcap_open_dead' function. */
 #cmakedefine HAVE_PCAP_OPEN_DEAD 1
 
-/* Define to 1 if you have libpcap/WinPcap remote capturing support. */
+/* Define to 1 if you have WinPcap remote capturing support and prefer to use
+   these new API features. */
 #cmakedefine HAVE_PCAP_REMOTE 1
 
 /* Define to 1 if you have the `pcap_set_datalink' function. */
@@ -290,6 +291,9 @@
 /* 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