From 73c6c8cf7c601ccb6e3ac036c625a5c05f7b62ae Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Wed, 12 Aug 2015 23:03:11 -0300
Subject: [PATCH] build: searching for pcre/geoip on /opt/local directory

---
 build/libgeoip.m4 | 4 ++--
 build/pcre.m4     | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/build/libgeoip.m4 b/build/libgeoip.m4
index a819fd66..9bcdf5aa 100644
--- a/build/libgeoip.m4
+++ b/build/libgeoip.m4
@@ -29,7 +29,7 @@ AC_ARG_WITH(
 
 AS_CASE(["${with_geoip}"],
   [no], [test_paths=],
-  [yes], [test_paths="/usr/local/libgeoip /usr/local/geoip /usr/local /opt/libgeoip /opt/geoip /opt /usr"],
+  [yes], [test_paths="/usr/local/libgeoip /usr/local/geoip /usr/local /opt/libgeoip /opt/geoip /opt /usr /opt/local/include /opt/local"],
   [test_paths="${with_geoip}"])
 
 AS_IF([test "x${test_paths}" != "x"], [
@@ -100,7 +100,7 @@ else
         fi
     done
     for x in ${test_paths}; do
-        if test -e "${x}/include/geoip_parse.h"; then
+        if test -e "${x}/include/GeoIPCity.h"; then
             geoip_inc_path="${x}/include"
             break
         elif test -e "${x}/GeoIPCity.h"; then
diff --git a/build/pcre.m4 b/build/pcre.m4
index 001e1954..67674755 100644
--- a/build/pcre.m4
+++ b/build/pcre.m4
@@ -19,17 +19,10 @@ AC_ARG_WITH(
     pcre,
     [AC_HELP_STRING([--with-pcre=PATH],[Path to pcre prefix or config script])],
     [test_paths="${with_pcre}"],
-    [test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr"])
+    [test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr /opt/local"])
 
 AC_MSG_CHECKING([for libpcre config script])
 
-dnl # Determine pcre lib directory
-if test -z "${with_pcre}"; then
-    test_paths="/usr/local/pcre /usr/local /usr"
-else
-    test_paths="${with_pcre}"
-fi
-
 for x in ${test_paths}; do
     dnl # Determine if the script was specified and use it directly
     if test ! -d "$x" -a -e "$x"; then