From ba64de5232d3b0124e540124fcded55f8c4d42ab Mon Sep 17 00:00:00 2001
From: Sam Varshavchik
Date: Sun, 28 Nov 2021 10:17:28 -0500
Subject: Convert to PCRE2.

---
 sqwebmail/Makefile.am  | 4 ++--
 sqwebmail/configure.ac | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'sqwebmail')

diff --git a/sqwebmail/Makefile.am b/sqwebmail/Makefile.am
index c9d2300..083f71c 100644
--- a/sqwebmail/Makefile.am
+++ b/sqwebmail/Makefile.am
@@ -96,8 +96,8 @@ sqwebmaild_SOURCES=acl.c acl.h \
 		strftime.c strftime.h \
 		sqwebmail.h token.c token.h $(SQISPELLSOURCES)
 
-sqwebmaild_LDADD=libwebmail.la @NETLIBS@ @LDAUTH@ -lcourierauth -lpcre
-sqwebmaild_DEPENDENCIES=libwebmail.la
+sqwebmaild_LDADD=libwebmail.la @NETLIBS@ @LDAUTH@ -lcourierauth `cat ../maildir/libmaildir.deps`
+sqwebmaild_DEPENDENCIES=libwebmail.la ../maildir/libmaildir.deps
 
 sqwebmail_SOURCES=sqwebmaild.c
 sqwebmail_DEPENDENCIES= ../cgi/libcgi.la
diff --git a/sqwebmail/configure.ac b/sqwebmail/configure.ac
index 05dc3d7..55a7c5e 100644
--- a/sqwebmail/configure.ac
+++ b/sqwebmail/configure.ac
@@ -88,6 +88,13 @@ else
 fi
 AC_SUBST(pkglibexecdir)
 
+AC_CHECK_PROG(PCRE2, pcre2-config, yes, no)
+
+if test "$PCRE2" = "no"
+then
+	AC_MSG_ERROR([pcre2-config was not found, please install PCRE2])
+fi
+
 AC_ARG_WITH(ispell,
 [  --without-ispell      Do not compile ispell support
   --with-ispell=prog    Pathname to ispell (if not in default path)],
-- 
cgit v1.2.3