github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix libgeoip lookup during the build

Browse Source
This commit is contained in:
Felipe Zimmerle 2015-08-10 15:22:32 -03:00
parent 52c419df69
commit 218eab6417
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/libgeoip.m4
View File

@ -103,17 +103,17 @@ else
if test -e "${x}/include/geoip_parse.h"; then if test -e "${x}/include/geoip_parse.h"; then
geoip_inc_path="${x}/include" geoip_inc_path="${x}/include"
break break
elif test -e "${x}/geoip_parse.h"; then elif test -e "${x}/GeoIPCity.h"; then
geoip_inc_path="${x}" geoip_inc_path="${x}"
break break
fi fi
dnl # Check some sub-paths as well dnl # Check some sub-paths as well
for geoip_pkg_name in ${geoip_lib_name} ${GEOIP_PKGNAMES}; do 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" geoip_inc_path="${x}/include"
break 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}" geoip_inc_path="${x}"
break break
else else

1
src/Makefile.am
View File

@ -186,6 +186,7 @@ libmodsecurity_la_CPPFLAGS = \
-fPIC \ -fPIC \
-O0 \ -O0 \
-I ../headers \ -I ../headers \
$(GEOIP_CFLAGS) \
$(PCRE_CPPFLAGS) $(PCRE_CPPFLAGS)
libmodsecurity_la_LIBADD = \ libmodsecurity_la_LIBADD = \