Add a HAVE_GEOIP_V6 configuration option and enable it by default.

svn path=/trunk/; revision=39283

Makefile.nmake

@@ -382,6 +382,7 @@ config.h	: config.h.win32 config.nmake
 	    -e "s/@PORTAUDIO_API_1@/$(PORTAUDIO_API_CONFIG)/" \
 	    -e "s/@HAVE_SMI@/$(SMI_CONFIG)/" \
 	    -e "s/@HAVE_GEOIP@/$(GEOIP_CONFIG)/" \
+	    -e "s/@HAVE_GEOIP_V6@/$(GEOIP_V6_CONFIG)/" \
 	    -e "s/@INET6@/$(INET6_CONFIG)/" \
 	    -e "s/@HAVE_NTDDNDIS_H@/$(NTDDNDIS_CONFIG)/" \
 	    -e "s/@PCAP_NG_DEFAULT@/$(PCAP_NG_DEFAULT)/" \

config.h.win32

@@ -219,9 +219,12 @@
 /* Define to have SMI */
 @HAVE_SMI@
 
-/* Define to have GeoIP */
+/* Define to use GeoIP library */
 @HAVE_GEOIP@
 
+/* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */
+@HAVE_GEOIP_V6@
+
 /* Define for IPv6 */
 @INET6@
 

config.nmake

@@ -1272,12 +1272,14 @@ SMI_CONFIG=
 
 !IFDEF GEOIP_DIR
 GEOIP_CONFIG=^#define HAVE_GEOIP 1
+GEOIP_V6_CONFIG=^#define HAVE_GEOIP_V6 1
 GEOIP_CFLAGS=/I$(GEOIP_DIR)
 GEOIP_LIBS=$(GEOIP_DIR)\GeoIP.lib
 !ELSE
-GeoIP_LIBS=
-GeoIP_CFLAGS=
-GeoIP_CONFIG=
+GEOIP_LIBS=
+GEOIP_CFLAGS=
+GEOIP_CONFIG=
+GEOIP_V6_CONFIG=
 !ENDIF
 
 !IFDEF ENABLE_LIBWIRESHARK