github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-17 06:36:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2833 from martinhsv/v2/master

Browse Source 
Only check for pcre2 install if required
This commit is contained in:
martinhsv 2022-11-16 15:27:58 -05:00 committed by GitHub
commit 2a42b08814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
DD mmm YYYY - 2.9.x (to be released) DD mmm YYYY - 2.9.x (to be released)
------------------- -------------------
* Only check for pcre2 install if required
[Issue #2833 - @martinhsv]
* Adjustment of previous fix for log messages * Adjustment of previous fix for log messages
[Issue #2832 - @marcstern, @erkia] [Issue #2832 - @marcstern, @erkia]
* Mark apache error log messages as from mod_security2 * Mark apache error log messages as from mod_security2

8
build/find_pcre2.m4
View File

@ -18,13 +18,17 @@ AC_DEFUN([CHECK_PCRE2],
AC_ARG_WITH( AC_ARG_WITH(
pcre2, pcre2,
[AC_HELP_STRING([--with-pcre2=PATH],[Path to pcre2 prefix or config script])], [AC_HELP_STRING([--with-pcre2=PATH],[Path to pcre2 prefix or config script])],
, with_pcre2=yes) , with_pcre2=no)
AS_CASE(["${with_pcre2}"], AS_CASE(["${with_pcre2}"],
[no], [test_paths=], [no], [test_paths=],
[yes], [test_paths="/usr/local/libpcre2 /usr/local/pcre2 /usr/local /opt/libpcre2 /opt/pcre2 /opt /usr"], [yes], [test_paths="/usr/local/libpcre2 /usr/local/pcre2 /usr/local /opt/libpcre2 /opt/pcre2 /opt /usr"],
[test_paths="${with_pcre2}"]) [test_paths="${with_pcre2}"])
if test "x${with_pcre2}" == "x" || test "x${with_pcre2}" == "xno"; then
AC_MSG_NOTICE([pcre2 not specified; omitting check])
else
AC_MSG_CHECKING([for libpcre2 config script]) AC_MSG_CHECKING([for libpcre2 config script])
for x in ${test_paths}; do for x in ${test_paths}; do
@ -79,9 +83,11 @@ AC_SUBST(PCRE_LD_PATH)
if test -z "${PCRE2_VERSION}"; then if test -z "${PCRE2_VERSION}"; then
AC_MSG_NOTICE([*** pcre2 library not found.]) AC_MSG_NOTICE([*** pcre2 library not found.])
ifelse([$2], , AC_MSG_ERROR([pcre2 library is required]), $2)
else else
AC_MSG_NOTICE([using pcre2 v${PCRE2_VERSION}]) AC_MSG_NOTICE([using pcre2 v${PCRE2_VERSION}])
PCRE2_CFLAGS="-DWITH_PCRE2 ${PCRE2_CFLAGS}" PCRE2_CFLAGS="-DWITH_PCRE2 ${PCRE2_CFLAGS}"
ifelse([$1], , , $1) ifelse([$1], , , $1)
fi fi
fi
]) ])