github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-10-01 12:07:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

build: fix yajl messages

Browse Source
This commit is contained in:
Felipe Zimmerle
2020-01-20 14:05:36 -03:00
parent 4f13fecbaf
commit a6620604d4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/yajl.m4
View File

@@ -32,13 +32,13 @@ AC_ARG_WITH(
) )
if test "x${with_yajl}" == "xno"; then if test "x${with_yajl}" == "xno"; then
AC_DEFINE(HAVE_GEOIP, 0, [Support for GeoIP was disabled by the utilization of --without-yajl or --with-yajl=no]) AC_DEFINE(HAVE_YAJL, 0, [Support for YAJL was disabled by the utilization of --without-yajl or --with-yajl=no])
AC_MSG_NOTICE([Support for GeoIP was disabled by the utilization of --without-yajl or --with-yajl=no]) AC_MSG_NOTICE([Support for YAJL was disabled by the utilization of --without-yajl or --with-yajl=no])
YAJL_DISABLED=yes YAJL_DISABLED=yes
else else
if test "x${with_yajl}" == "xyes"; then if test "x${with_yajl}" == "xyes"; then
YAJL_MANDATORY=yes YAJL_MANDATORY=yes
AC_MSG_NOTICE([GeoIP support was marked as mandatory by the utilization of --with-yajl=yes]) AC_MSG_NOTICE([YAJL support was marked as mandatory by the utilization of --with-yajl=yes])
fi fi
# for x in ${YAJL_POSSIBLE_LIB_NAMES}; do # for x in ${YAJL_POSSIBLE_LIB_NAMES}; do
# CHECK_FOR_YAJL_AT(${x}) # CHECK_FOR_YAJL_AT(${x})
@@ -49,7 +49,7 @@ else
# if test "x${with_yajl}" != "xyes" or test "x${with_yajl}" == "xyes"; then # if test "x${with_yajl}" != "xyes" or test "x${with_yajl}" == "xyes"; then
if test "x${with_yajl}" == "x" || test "x${with_yajl}" == "xyes"; then if test "x${with_yajl}" == "x" || test "x${with_yajl}" == "xyes"; then
# Nothing about GeoIP was informed, using the pkg-config to figure things out. # Nothing about YAJL was informed, using the pkg-config to figure things out.
if test -n "${PKG_CONFIG}"; then if test -n "${PKG_CONFIG}"; then
YAJL_PKG_NAME="" YAJL_PKG_NAME=""
for x in ${YAJL_POSSIBLE_LIB_NAMES}; do for x in ${YAJL_POSSIBLE_LIB_NAMES}; do
@@ -59,7 +59,7 @@ else
fi fi
done done
fi fi
AC_MSG_NOTICE([Nothing about GeoIP was informed during the configure phase. Trying to detect it on the platform...]) AC_MSG_NOTICE([Nothing about YAJL was informed during the configure phase. Trying to detect it on the platform...])
if test -n "${YAJL_PKG_NAME}"; then if test -n "${YAJL_PKG_NAME}"; then
# Package was found using the pkg-config scripts # Package was found using the pkg-config scripts
YAJL_VERSION="`${PKG_CONFIG} ${YAJL_PKG_NAME} --modversion`" YAJL_VERSION="`${PKG_CONFIG} ${YAJL_PKG_NAME} --modversion`"