Bugfix: Fixed broken libGeoIP detection in CMakeLists.txt.

Author: dreibh

CMakeLists.txt

@@ -150,16 +150,16 @@ ENDIF()
 INCLUDE(FindPackageHandleStandardArgs)
 
 # ###### GeoIP ##############################################################
-FIND_LIBRARY(GeoIP_LIBRARY NAMES GeoIP)
-FIND_PATH(GeoIP_INCLUDE_DIR NAMES GeoIP.h GeoIPCity.h)
-IF (GEOIP_FOUND)
-   INCLUDE_DIRECTORIES(${GeoIP_INCLUDE_DIR})
+FIND_LIBRARY(GEOIP_LIBRARY NAMES GeoIP)
+FIND_PATH(GEOIP_INCLUDE_DIR NAMES GeoIP.h GeoIPCity.h)
+IF ((GEOIP_LIBRARY) AND (GEOIP_INCLUDE_DIR))
+   FIND_PACKAGE_HANDLE_STANDARD_ARGS(GeoIP DEFAULT_MSG GEOIP_LIBRARY GEOIP_INCLUDE_DIR)
+   INCLUDE_DIRECTORIES(${GEOIP_INCLUDE_DIR})
    ADD_DEFINITIONS(-DHAVE_GEOIP -DHAVE_GEOIP_IPV6)
    MESSAGE(STATUS "GeoIP found.")
 ELSE()
    MESSAGE(STATUS "GeoIP not found!")
 ENDIF()
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GeoIP DEFAULT_MSG GeoIP_LIBRARY GeoIP_INCLUDE_DIR)
 
 
 #############################################################################

src/CMakeLists.txt

@@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 ADD_EXECUTABLE(subnetcalc subnetcalc.cc tools.cc)
 TARGET_LINK_LIBRARIES(subnetcalc ${Intl_LIBRARIES})
 IF (GEOIP_FOUND)
-   TARGET_LINK_LIBRARIES(subnetcalc ${GeoIP_LIBRARY})
+   TARGET_LINK_LIBRARIES(subnetcalc ${GEOIP_LIBRARY})
 ENDIF()
 INSTALL(TARGETS     subnetcalc   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 INSTALL(FILES       subnetcalc.1 DESTINATION         ${CMAKE_INSTALL_MANDIR}/man1)