Since we know the version of WinPcap we're compiling against, go ahead and display...

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

diff --git a/capture-wpcap.c b/capture-wpcap.c
index 02622a35061f4d0e87599b9eda18157e3fbb1e6a..26a7ca169bffd02e221a501c251571f5d28f7188 100644 (file)
--- a/capture-wpcap.c
+++ b/capture-wpcap.c
@@ -903,7 +903,7 @@ cant_get_if_list_error_message(const char *err_str)
 void
 get_compiled_pcap_version(GString *str)
 {
-       g_string_append(str, "with WinPcap (version unknown)");
+       g_string_append(str, "with WinPcap (" PCAP_VERSION ")");
 }
 
 /*

diff --git a/config.nmake b/config.nmake
index 72290f64b776601bd6087b80adac90580e74f826..f858eae40485a7d385be301e92d4b1a4107b2857 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -769,7 +769,7 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX-
 !ENDIF
 
 #STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
-STANDARD_CFLAGS=-DHAVE_CONFIG_H -D_U_="" $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
+STANDARD_CFLAGS=-DHAVE_CONFIG_H -D_U_="" /DPCAP_VERSION="\"$(PCAP_VERSION)\"" $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
 
 #Comment out the following if warnings are not to be treated as errors
 WARNINGS_ARE_ERRORS=-WX