build: searching for pcre/geoip on /opt/local directory

This commit is contained in:
Felipe Zimmerle 2015-08-12 23:03:11 -03:00
parent d5fe21ce3c
commit 73c6c8cf7c
2 changed files with 3 additions and 10 deletions

View File

@ -29,7 +29,7 @@ AC_ARG_WITH(
AS_CASE(["${with_geoip}"], AS_CASE(["${with_geoip}"],
[no], [test_paths=], [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}"]) [test_paths="${with_geoip}"])
AS_IF([test "x${test_paths}" != "x"], [ AS_IF([test "x${test_paths}" != "x"], [
@ -100,7 +100,7 @@ else
fi fi
done done
for x in ${test_paths}; do 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" geoip_inc_path="${x}/include"
break break
elif test -e "${x}/GeoIPCity.h"; then elif test -e "${x}/GeoIPCity.h"; then

View File

@ -19,17 +19,10 @@ AC_ARG_WITH(
pcre, pcre,
[AC_HELP_STRING([--with-pcre=PATH],[Path to pcre prefix or config script])], [AC_HELP_STRING([--with-pcre=PATH],[Path to pcre prefix or config script])],
[test_paths="${with_pcre}"], [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]) 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 for x in ${test_paths}; do
dnl # Determine if the script was specified and use it directly dnl # Determine if the script was specified and use it directly
if test ! -d "$x" -a -e "$x"; then if test ! -d "$x" -a -e "$x"; then