From 799d2cf0f656a98847fa98daddda8781e3a4bae2 Mon Sep 17 00:00:00 2001 From: jmayer Date: Sat, 8 Oct 2011 06:09:38 +0000 Subject: [PATCH] Mimic test for IPv6 support in GeoIP from autofoo git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39307 f5534014-38df-0310-8fa8-9805f1628bb7 --- cmake/modules/FindGEOIP.cmake | 14 ++++++++++---- cmakeconfig.h.in | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindGEOIP.cmake b/cmake/modules/FindGEOIP.cmake index a7c993db78..09a763ea23 100644 --- a/cmake/modules/FindGEOIP.cmake +++ b/cmake/modules/FindGEOIP.cmake @@ -25,11 +25,17 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOIP DEFAULT_MSG GEOIP_LIBRARY GEOIP_INCLUDE_DIR) IF(GEOIP_FOUND) - SET( GEOIP_LIBRARIES ${GEOIP_LIBRARY} ) - SET( GEOIP_INCLUDE_DIRS ${GEOIP_INCLUDE_DIR} ) + SET(GEOIP_LIBRARIES ${GEOIP_LIBRARY} ) + SET(GEOIP_INCLUDE_DIRS ${GEOIP_INCLUDE_DIR} ) + INCLUDE(CheckFunctionExists) + SET(CMAKE_REQUIRED_INCLUDES ${GEOIP_INCLUDE_DIRS}) + SET(CMAKE_REQUIRED_LIBRARIES ${GEOIP_LIBRARIES}) + CHECK_FUNCTION_EXISTS("GeoIP_country_name_by_ipnum_v6" HAVE_GEOIP_V6) + SET(CMAKE_REQUIRED_INCLUDES "") + SET(CMAKE_REQUIRED_LIBRARIES "") ELSE(GEOIP_FOUND) - SET( GEOIP_LIBRARIES ) - SET( GEOIP_INCLUDE_DIRS ) + SET(GEOIP_LIBRARIES ) + SET(GEOIP_INCLUDE_DIRS ) ENDIF(GEOIP_FOUND) MARK_AS_ADVANCED( GEOIP_LIBRARIES GEOIP_INCLUDE_DIRS ) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 6c6e571511..0ef4163680 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -72,6 +72,9 @@ /* Define to use GEOIP library */ #cmakedefine HAVE_GEOIP 1 +/* Define if GEOIP library supports IPv6 (GeoIP 1.4.5 and later) */ +#cmakedefine HAVE_GEOIP_V6 1 + /* Define to use capabilities library */ #cmakedefine HAVE_LIBCAP 1 -- 2.34.1