Add a HAVE_GEOIP_V6 configuration option and enable it by default.

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

diff --git a/Makefile.nmake b/Makefile.nmake
index 3e52114e08e5c13897b07eba5375465fe03d06e1..fa08c658ae75aa32cf97e6cbf5667cdd21be7548 100644 (file)
--- a/Makefile.nmake
+++ b/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)/" \

diff --git a/config.h.win32 b/config.h.win32
index 41cd54c593d969657e7a72703e6115565aa950c2..7055cf931abb537b73497b7afe33d560f4d3b8f7 100644 (file)
--- a/config.h.win32
+++ b/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@
 

diff --git a/config.nmake b/config.nmake
index edccfe3d2acd0ff01ae03492f44e670609d0440d..d3d581cea1521a6a83768719494016cc67e2be9e 100644 (file)
--- a/config.nmake
+++ b/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