Rebase against 6c637ab9c6a65d5601f98545b05f413f777c444e.

patches/wpcap-Dynamic_Linking/0001-wpcap-Load-libpcap-dynamically.patch

@@ -1,4 +1,4 @@
-From b5186872d7485ef90c957e855af6a2124fc40834 Mon Sep 17 00:00:00 2001
+From 1fee677cce6255628039d2e6b9e9fc12e57b998c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
 Date: Tue, 26 Aug 2014 00:59:37 +0200
 Subject: wpcap: Load libpcap dynamically.
@@ -6,16 +6,16 @@ Subject: wpcap: Load libpcap dynamically.
 This is intended for packagers, without this patch libpcap easily becomes a fixed dependency of wine.
 Something we don't want i guess.
 ---
- configure.ac           |   6 +-
+ configure.ac           |   4 +-
  dlls/wpcap/Makefile.in |   1 -
  dlls/wpcap/wpcap.c     | 171 +++++++++++++++++++++++++++++++++++++++----------
- 3 files changed, 140 insertions(+), 38 deletions(-)
+ 3 files changed, 139 insertions(+), 37 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 811e2aa..30b500a 100644
+index 1e6bba3..f0a3b55 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1182,11 +1182,11 @@ test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_op
+@@ -1174,9 +1174,9 @@ WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes],
  dnl **** Check for libpcap ****
  if test "$ac_cv_header_pcap_pcap_h" = "yes"
  then
@@ -24,11 +24,8 @@ index 811e2aa..30b500a 100644
  fi
 -WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes],
 +WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_soname_pcap" = "x"],
-                  [pcap ${notice_platform}development files not found, wpcap won't be supported.])
--test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_wpcap=${enable_wpcap:-no}
-+test "x$ac_cv_lib_soname_pcap" = "x" && enable_wpcap=${enable_wpcap:-no}
- 
- dnl **** Check for libxml2 ****
+                  [pcap ${notice_platform}development files not found, wpcap won't be supported.],
+                  [enable_wpcap])
  
 diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in
 index 91b4a95..aeef71a 100644