From 74784bdb3ef60d02f6041f6ec6c3b56e3841a2db Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Fri, 14 Apr 2017 16:52:10 +0200 Subject: Update Windows binaries to GeoIP 1.6.10 with a local GeoIP_free function This solves a crash occurring when trying to free memory allocated by GeoIP (cross-compiled with mingw(32|64)) with MSVC function Bug: 13598 Change-Id: I757cff13660bd485d7ea91d10660e9bf86404728 Reviewed-on: https://code.wireshark.org/review/21090 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- acinclude.m4 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 index ee172ef470..11c657fd87 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1122,6 +1122,11 @@ AC_DEFUN([AC_WIRESHARK_GEOIP_CHECK], AC_DEFINE(HAVE_GEOIP_V6, 1, [Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later)]) ],, ) + AC_CHECK_LIB(GeoIP, GeoIP_free, + [ + AC_DEFINE(HAVE_GEOIP_FREE, 1, [Define if GeoIP has GeoIP_free (not available upstream with 1.6.10 or earlier)]) + ],, + ) fi else AC_MSG_RESULT(not required) -- cgit v1.2.1