Enable GeoIP if INETSDK is defined (which should mean we have IPv6

definitions even if we're running Visual C++ 6.0).

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

diff --git a/config.nmake b/config.nmake
index 79db80567752631c0a2c0454116fccabdff67576..536b98a952e58487ebea6d22685179d04f23e42f 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -330,11 +330,10 @@ SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
 #
 # Used to map IP addresses to MaxMind GeoIP database entries
 #
-# GeoIP requires IPv6 definitions that don't ship with Visual C++ 6.0. If
-# you're using MSVC6 and you REALLY want to compile with GeoIP, install the
-# Platform SDK for Windows Server 2003 R2 and comment out the !IF/!ENDIF
-# lines below.
-!IF "$(MSVC_VARIANT)" != "MSVC6"
+# GeoIP requires IPv6 definitions that don't ship with Visual C++ 6.0.
+# However, the Microsoft Platform SDK for Windows Server 2003 R2 provides
+# these definitions. The SDK's SetEnv.bat script defines INETSDK.
+!IF "$(MSVC_VARIANT)" != "MSVC6" || DEFINED(INETSDK)
 GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.5ws
 !ENDIF