Merge pull request #319 from bellgrim/issue313

Issue #313: Detecting CppUnit when using Macports.
opendnssec · May 21, 2017 · 28ee60c · 28ee60c
2 parents 7a70d7c + cb33ca9
commit 28ee60c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -45,6 +45,8 @@ Bugfixes:
 * Issue #289: Minor fix of 'EVP_CipherFinal_ex'.
   (Patch from Viktor Tarasov)
 * Issue #305: Zero pad key to fit the block in CKM_AES_KEY_WRAP.
+* Issue #313: Detecting CppUnit when using Macports.
+  (Patch from mouse07410)
 
 
 SoftHSM 2.2.0 - 2016-12-05

diff --git a/m4/acx_cppunit.m4 b/m4/acx_cppunit.m4
@@ -1,12 +1,20 @@
 AC_DEFUN([ACX_CPPUNIT],[
 	AC_PATH_PROG([CPPUNIT_CONFIG], [cppunit-config])
+	AC_PATH_PROG([PKG_CONFIG], [pkg-config])
 	if test -n "${CPPUNIT_CONFIG}"; then
 		AC_MSG_CHECKING([cppunit cflags])
 		CPPUNIT_CFLAGS=`${CPPUNIT_CONFIG} --cflags`
 		AC_MSG_RESULT([${CPPUNIT_CFLAGS}])
 		AC_MSG_CHECKING([cppunit libs])
 		CPPUNIT_LIBS=`${CPPUNIT_CONFIG} --libs`
 		AC_MSG_RESULT([${CPPUNIT_LIBS}])
+	elif test -n "${PKG_CONFIG}"; then
+		AC_MSG_CHECKING([cppunit cflags])
+		CPPUNIT_CFLAGS=`${PKG_CONFIG} cppunit --cflags`
+		AC_MSG_RESULT([${CPPUNIT_CFLAGS}])
+		AC_MSG_CHECKING([cppunit libs])
+		CPPUNIT_LIBS=`${PKG_CONFIG} cppunit --libs`
+		AC_MSG_RESULT([${CPPUNIT_LIBS}])
 	fi
 	AC_SUBST([CPPUNIT_CFLAGS])
 	AC_SUBST([CPPUNIT_LIBS])