From 5203410ccddb022f1a212be4edce751de28b8176 Mon Sep 17 00:00:00 2001
From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: Mar 29 2019 01:39:47 +0000
Subject: Use PKG_CHECK_MODULES to detect the pcre library


---

diff --git a/Makefile.am b/Makefile.am
index 3b84de5..f4beae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -171,7 +171,6 @@ ldaplib_defs = @ldaplib_defs@
 
 DB_LINK = @db_lib@ -ldb-@db_libver@
 SASL_LINK = @sasl_lib@ -lsasl2
-PCRE_LINK = @pcre_lib@ -lpcre
 NETSNMP_LINK = @netsnmp_lib@ @netsnmp_link@
 PAM_LINK = -lpam
 KERBEROS_LINK = $(kerberos_lib)
@@ -1387,8 +1386,8 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
 	ldap/servers/slapd/slapi_pal.c \
 	$(libavl_a_SOURCES)
 
-libslapd_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(SASL_INCLUDES) @db_inc@ @kerberos_inc@ @pcre_inc@ $(SDS_CPPFLAGS) $(SVRCORE_INCLUDES)
-libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(KERBEROS_LINK) $(PCRE_LINK) $(THREADLIB) $(SYSTEMD_LINK) libsds.la libsvrcore.la
+libslapd_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(SASL_INCLUDES) @db_inc@ @kerberos_inc@ $(PCRE_CFLAGS) $(SDS_CPPFLAGS) $(SVRCORE_INCLUDES)
+libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(KERBEROS_LINK) $(PCRE_LIBS) $(THREADLIB) $(SYSTEMD_LINK) libsds.la libsvrcore.la
 libslapd_la_LDFLAGS = $(AM_LDFLAGS) $(SLAPD_LDFLAGS)
 
 
diff --git a/configure.ac b/configure.ac
index a5434bf..27354ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -842,7 +842,16 @@ PKG_CHECK_MODULES([ICU], [icu-i18n >= 60.2])
 
 m4_include(m4/netsnmp.m4)
 m4_include(m4/kerberos.m4)
-m4_include(m4/pcre.m4)
+
+if $PKG_CONFIG --exists pcre; then
+    PKG_CHECK_MODULES([PCRE], [pcre])
+    pcre_libdir=`$PKG_CONFIG --libs-only-L pcre | sed -e s/-L// | sed -e s/\ .*$//`
+else
+    PKG_CHECK_MODULES([PCRE], [libpcre])
+    pcre_libdir=`$PKG_CONFIG --libs-only-L libpcre | sed -e s/-L// | sed -e s/\ .*$//`
+fi
+AC_SUBST(pcre_libdir)
+
 m4_include(m4/selinux.m4)
 m4_include(m4/systemd.m4)
 
@@ -885,9 +894,6 @@ AC_SUBST(sasl_inc)
 AC_SUBST(sasl_lib)
 AC_SUBST(sasl_libdir)
 AC_SUBST(sasl_path)
-AC_SUBST(pcre_inc)
-AC_SUBST(pcre_lib)
-AC_SUBST(pcre_libdir)
 AC_SUBST(nunc_stans_inc)
 AC_SUBST(nunc_stans_lib)
 AC_SUBST(nunc_stans_libdir)
diff --git a/m4/pcre.m4 b/m4/pcre.m4
deleted file mode 100644
index 71b8944..0000000
--- a/m4/pcre.m4
+++ /dev/null
@@ -1,80 +0,0 @@
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-#
-# License: GPL (version 3 or any later version).
-# See LICENSE for details. 
-# END COPYRIGHT BLOCK
-
-AC_CHECKING(for PCRE)
-
-dnl  - check for --with-pcre
-AC_MSG_CHECKING(for --with-pcre)
-AC_ARG_WITH(pcre, AS_HELP_STRING([--with-pcre@<:@=PATH@:>@],[Perl Compatible Regular Expression directory]),
-[
-  if test "$withval" = "yes"; then
-    AC_MSG_RESULT(yes)
-  elif test "$withval" = "no"; then
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR([PCRE is required.])
-  elif test -d "$withval"/include -a -d "$withval"/lib; then
-    AC_MSG_RESULT([using $withval])
-    dnl - check the user provided location
-    PCREDIR=$withval
-    pcre_lib="-L$PCREDIR/lib"
-    pcre_libdir="$PCREDIR/lib"
-    pcre_incdir="$PCREDIR/include"
-    if ! test -e "$pcre_incdir/pcre.h" ; then
-      AC_MSG_ERROR([$withval include dir not found])
-    fi
-    pcre_inc="-I$pcre_incdir"
-  else
-    echo
-    AC_MSG_ERROR([$withval not found])
-  fi
-],
-AC_MSG_RESULT(yes))
-
-#
-# if PCRE is not found yet, try pkg-config
-if test -z "$pcre_inc" -o -z "$pcre_lib" -o -z "$pcre_libdir"; then
-  AC_PATH_PROG(PKG_CONFIG, pkg-config)
-  AC_MSG_CHECKING(for pcre with pkg-config)
-  if test -n "$PKG_CONFIG"; then
-    if $PKG_CONFIG --exists pcre; then
-      pcre_inc=`$PKG_CONFIG --cflags-only-I pcre`
-      pcre_lib=`$PKG_CONFIG --libs-only-L pcre`
-      pcre_libdir=`$PKG_CONFIG --libs-only-L pcre | sed -e s/-L// | sed -e s/\ .*$//`
-      AC_MSG_RESULT([using system PCRE])
-    elif $PKG_CONFIG --exists libpcre; then
-      pcre_inc=`$PKG_CONFIG --cflags-only-I libpcre`
-      pcre_lib=`$PKG_CONFIG --libs-only-L libpcre`
-      pcre_libdir=`$PKG_CONFIG --libs-only-L libpcre | sed -e s/-L// | sed -e s/\ .*$//`
-      AC_MSG_RESULT([using system PCRE])
-    else
-      AC_MSG_ERROR([PCRE not found, specify with --with-pcre.])
-    fi
-  fi
-fi
-
-dnl last resort
-dnl - check in system locations
-if test -z "$pcre_inc"; then
-  AC_MSG_CHECKING(for pcre.h)
-  if test -f "/usr/include/pcre/pcre.h"; then
-    AC_MSG_RESULT([using /usr/include/pcre/pcre.h])
-    pcre_incdir="/usr/include/pcre"
-    pcre_inc="-I/usr/include/pcre"
-    pcre_lib='-L$(libdir)'
-    pcre_libdir='$(libdir)'
-  elif test -f "/usr/include/pcre.h"; then
-    AC_MSG_RESULT([using /usr/include/pcre.h])
-    pcre_incdir="/usr/include"
-    pcre_inc="-I/usr/include"
-    pcre_lib='-L$(libdir)'
-    pcre_libdir='$(libdir)'
-  else
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR([PCRE not found, specify with --with-pcre.])
-  fi
-fi