Undefine AIRPCAP_DIR to get the Windows build going again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21841 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/airpcap_loader.c b/airpcap_loader.c
index f7ef397c16b0fc83640ffb4ceb6d4c5f2e1b3c2f..cb388c2e56efcff798f86df0fd598ff3cc12543c 100644 (file)
--- a/airpcap_loader.c
+++ b/airpcap_loader.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef _WIN32
-
+#ifdef HAVE_AIRPCAP
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -2659,5 +2659,5 @@ get_runtime_airpcap_version(GString *str)
     g_string_sprintfa(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin,
        vrev, build);
 }
-
+#endif /* HAVE_AIRPCAP */
 #endif /* _WIN32 */

diff --git a/config.nmake b/config.nmake
index 74603cc852e1675724f96997b30b8981c56ff10e..601579847453ea5ad43eccaab041c381d541aa32 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -291,7 +291,7 @@ GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
 # If you don't have the AirPcap developer's pack, comment this line out, 
 # so that AIRPCAP_DIR isn't defined.
 #
-AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_1_0_0_594\AirPcap_Devpack
+#AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_1_0_0_594\AirPcap_Devpack