From d6a32479320e98de9662eb40c8bb970b3daae3cc 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 cmocka library


---

diff --git a/Makefile.am b/Makefile.am
index 57f42f8..3b84de5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ UBSAN_CFLAGS = @ubsan_cflags@
 
 SYSTEMD_DEFINES = @systemd_defs@
 
-CMOCKA_INCLUDES = @cmocka_inc@
+CMOCKA_INCLUDES = $(CMOCKA_CFLAGS)
 
 PROFILING_DEFINES = @profiling_defs@
 NSPR_INCLUDES = $(NSPR_CFLAGS)
@@ -151,7 +151,7 @@ NUNCSTANS_CPPFLAGS = $(NSPR_INCLUDES) $(NUNCSTANS_INCLUDES) $(SDS_INCLUDES) $(EV
 # Linker Flags
 #------------------------
 SYSTEMD_LINK = @systemd_lib@
-CMOCKA_LINKS = @cmocka_lib@
+CMOCKA_LINKS = $(CMOCKA_LIBS)
 PROFILING_LINKS = @profiling_links@
 
 NSPR_LINK = $(NSPR_LIBS)
@@ -612,7 +612,7 @@ dist_noinst_HEADERS += \
 	src/libsds/external/liblfds711/src/lfds711_queue_unbounded_manyproducer_manyconsumer/lfds711_queue_unbounded_manyproducer_manyconsumer_internal.h
 endif
 
-if WITH_CMOCKA
+if ENABLE_CMOCKA
 dist_noinst_HEADERS += \
 	test/test_slapd.h \
 	src/libsds/test/test_sds.h \
@@ -2125,7 +2125,7 @@ rsearch_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKE
 #-------------------------
 # CMOCKA TEST PROGRAMS
 #-------------------------
-if WITH_CMOCKA
+if ENABLE_CMOCKA
 
 check_PROGRAMS = test_slapd \
 	test_libsds \
diff --git a/configure.ac b/configure.ac
index bd2b7bb..a5434bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -845,7 +845,18 @@ m4_include(m4/kerberos.m4)
 m4_include(m4/pcre.m4)
 m4_include(m4/selinux.m4)
 m4_include(m4/systemd.m4)
-m4_include(m4/cmocka.m4)
+
+AC_MSG_CHECKING(whether to enable cmocka unit tests)
+AC_ARG_ENABLE(cmocka, AS_HELP_STRING([--enable-cmocka], [Enable cmocka unit tests (default: no)]))
+if test "x$enable_cmocka" = "xyes"; then
+    AC_MSG_RESULT(yes)
+    PKG_CHECK_MODULES([CMOCKA], [cmocka])
+    AC_DEFINE([ENABLE_CMOCKA], [1], [Enable cmocka unit tests])
+else
+    AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL([ENABLE_CMOCKA], [test "x$enable_cmocka" = "xyes"])
+
 m4_include(m4/doxygen.m4)
 
 PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'`
diff --git a/m4/cmocka.m4 b/m4/cmocka.m4
deleted file mode 100644
index bb7d4d3..0000000
--- a/m4/cmocka.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-## BEGIN COPYRIGHT BLOCK
-## Copyright (c) 2016, William Brown <william at blackhats dot net dot au>
-## All rights reserved.
-##
-## License: License: GPL (version 3 or any later version).
-## See LICENSE for details.
-## END COPYRIGHT BLOCK
-
-AC_MSG_CHECKING(for --enable-cmocka)
-AC_ARG_ENABLE(cmocka, AS_HELP_STRING([--enable-cmocka], [Enable cmocka based tests (default: no)]),
-[
-    AC_MSG_RESULT(yes)
-    AC_DEFINE([WITH_CMOCKA], [1], [With cmocka unit tests])
-    with_cmocka="yes"
-    AC_MSG_CHECKING(for cmocka)
-    if $PKG_CONFIG --exists cmocka; then
-        cmocka_inc=`$PKG_CONFIG --cflags cmocka`
-        cmocka_lib=`$PKG_CONFIG --libs cmocka`
-        AC_MSG_RESULT([using system cmocka])
-    else
-        AC_MSG_ERROR([pkg-config could not find cmocka!])
-    fi
-],
-[
-    AC_MSG_RESULT(no)
-    with_cmocka="0"
-])
-
-AM_CONDITIONAL([WITH_CMOCKA], [test "$with_cmocka" = "yes"])
-AC_SUBST(cmocka_inc)
-AC_SUBST(cmocka_lib)
-
-