From 218eab6417e83612deead96d288e488eebbfc0e7 Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Mon, 10 Aug 2015 15:22:32 -0300
Subject: [PATCH] Fix libgeoip lookup during the build

---
 build/libgeoip.m4 | 6 +++---
 src/Makefile.am   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/libgeoip.m4 b/build/libgeoip.m4
index 9f413263..a819fd66 100644
--- a/build/libgeoip.m4
+++ b/build/libgeoip.m4
@@ -103,17 +103,17 @@ else
         if test -e "${x}/include/geoip_parse.h"; then
             geoip_inc_path="${x}/include"
             break
-        elif test -e "${x}/geoip_parse.h"; then
+        elif test -e "${x}/GeoIPCity.h"; then
             geoip_inc_path="${x}"
             break
         fi
 
         dnl # Check some sub-paths as well
         for geoip_pkg_name in ${geoip_lib_name} ${GEOIP_PKGNAMES}; do
-            if test -e "${x}/include/${geoip_pkg_name}/geoip_parse.h"; then
+            if test -e "${x}/include/${geoip_pkg_name}/GeoIPCity.h"; then
                 geoip_inc_path="${x}/include"
                 break
-            elif test -e "${x}/${geoip_pkg_name}/geoip_parse.h"; then
+            elif test -e "${x}/${geoip_pkg_name}/GeoIPCity.h"; then
                 geoip_inc_path="${x}"
                 break
             else
diff --git a/src/Makefile.am b/src/Makefile.am
index 82e44796..e2a0fa0d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -186,6 +186,7 @@ libmodsecurity_la_CPPFLAGS = \
 	-fPIC \
 	-O0 \
 	-I ../headers \
+	$(GEOIP_CFLAGS) \
 	$(PCRE_CPPFLAGS)
 
 libmodsecurity_la_LIBADD = \