Merge pull request e2guardian#798 from sunweaver/pr/pcre2

PCRE support: Build against pcre2 rather than deprecated pcre shared …
pornography-protection · Feb 12, 2024 · 998a01d · 998a01d
2 parents ecd2754 + e0ba4e4
commit 998a01d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -235,9 +235,8 @@ AC_MSG_RESULT(yes)
 )
 
 if test "x$pcre" = "xtrue"; then
-PKG_CHECK_MODULES([PCRE],[libpcre >= 6.0])
+PKG_CHECK_MODULES([PCRE],[libpcre2-posix >= 10.42])
 AC_DEFINE([HAVE_PCRE],[],[Define to enable PCRE support])
-PCRE_LIBS="-lpcreposix ${PCRE_LIBS}"
 else
 AC_CHECK_FUNCS([regcomp])
 fi

diff --git a/src/RegExp.hpp b/src/RegExp.hpp
@@ -13,7 +13,7 @@
 #include <sys/types.h> // needed for size_t used in regex.h
 
 #ifdef HAVE_PCRE
-#include <pcreposix.h>
+#include <pcre2posix.h>
 #else
 #include <regex.h>
 #endif