github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2975 from martinhsv/v2/master

Browse Source 
Configure: do not check for pcre1 if pcre2 requested
This commit is contained in:
martinhsv
2023-10-12 10:47:08 -04:00
committed by GitHub
parent 0dbdc2b3d0 d4310f54cc
commit 68683c328c
1 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/find_pcre.m4
View File

@@ -21,6 +21,9 @@ 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"]) [test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr"])
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])
dnl # Determine pcre lib directory dnl # Determine pcre lib directory
@@ -86,4 +89,5 @@ else
AC_MSG_NOTICE([using pcre v${PCRE_VERSION}]) AC_MSG_NOTICE([using pcre v${PCRE_VERSION}])
ifelse([$1], , , $1) ifelse([$1], , , $1)
fi fi
fi
]) ])