instead of putting the MSC_VER_REQUIRED test into the root Makefile (which would require to change ALL makefiles - the buildbot revealed it), simply put it in the wiretap generation. As wiretap is mandatory and one of the first things to be build this doesn't even sound like a bad idea anyway ...

svn path=/trunk/; revision=20646

Makefile.nmake

@@ -17,7 +17,7 @@ CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
 	$(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \
 	$(NET_SNMP_CFLAGS) \
 	$(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(LUA_CFLAGS) \
-	-D_U_="" -D_NEED_VAR_IMPORT_ -DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
+	-D_U_="" -D_NEED_VAR_IMPORT_
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 

config.h.win32

@@ -253,11 +253,3 @@
 
 /* We shouldn't need this under Windows but we'll define it anyway. */
 #define HTML_VIEWER "mozilla"
-
-/* Check for the required _MSC_VER */
-#if MSC_VER_REQUIRED != _MSC_VER
-#define WS_TO_STRING2(x) #x
-#define WS_TO_STRING(x) WS_TO_STRING2(x)
-#pragma message( "_MSC_VER is:" WS_TO_STRING(_MSC_VER) " but required is:" WS_TO_STRING(MSC_VER_REQUIRED) )
-#error Your MSVC_VARIANT setting in config.nmake doesn't match the MS compiler version!
-#endif

wiretap/Makefile.nmake

@@ -10,7 +10,7 @@ include <win32.mak>
 include Makefile.common
 
 CFLAGS=-DHAVE_CONFIG_H $(GLIB_CFLAGS) $(ZLIB_CFLAGS) /I$(PCAP_DIR)/include \
-	-D_U_="" $(LOCAL_CFLAGS)
+	-D_U_="" $(LOCAL_CFLAGS) -DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 

wiretap/config.h.win32

@@ -50,3 +50,11 @@
 /* Needed for zlib, according to http://www.winimage.com/zLibDll/ */
 /*#define ZLIB_DLL		1
 #define _WINDOWS		1*/
+
+/* Check for the required _MSC_VER */
+#if MSC_VER_REQUIRED != _MSC_VER
+#define WS_TO_STRING2(x) #x
+#define WS_TO_STRING(x) WS_TO_STRING2(x)
+#pragma message( "_MSC_VER is:" WS_TO_STRING(_MSC_VER) " but required is:" WS_TO_STRING(MSC_VER_REQUIRED) )
+#error Your MSVC_VARIANT setting in config.nmake doesn't match the MS compiler version!
+#endif