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

During configure, do not check for pcre if pcre2 specified

Browse Source
This commit is contained in:
Martin Vierula 2022-11-10 07:50:52 -08:00
parent de01b02731
commit 791964a0ea
No known key found for this signature in database
GPG Key ID: F2FC4E45883BCBA4
2 changed files with 81 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
v3.x.y - YYYY-MMM-DD (to be released) v3.x.y - YYYY-MMM-DD (to be released)
------------------------------------- -------------------------------------
- During configure, do not check for pcre if pcre2 specified
[Issue #2750 - @dvershinin, @martinhsv]
- Use pkg-config to find libxml2 first - Use pkg-config to find libxml2 first
[Issue #2714 - @hughmcmaster] [Issue #2714 - @hughmcmaster]
- Fix two rule-reload memory leak issues - Fix two rule-reload memory leak issues

5
build/pcre.m4
View File

@ -21,6 +21,10 @@ AC_ARG_WITH(
[test_paths="${with_pcre}"], [test_paths="${with_pcre}"],
[test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr /opt/local"]) [test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr /opt/local"])
if test "x${with_pcre2}" != "x" && test "x${with_pcre2}" != "xno"; then
AC_MSG_NOTICE([pcre2 specified; omitting check for pcre])
else
AC_MSG_CHECKING([for libpcre config script]) AC_MSG_CHECKING([for libpcre config script])
for x in ${test_paths}; do for x in ${test_paths}; do
@ -105,4 +109,5 @@ else
ifelse([$1], , , $1) ifelse([$1], , , $1)
PCRE_LDADD="${PCRE_LDADD} -lpcre" PCRE_LDADD="${PCRE_LDADD} -lpcre"
fi fi
fi
]) ])