Update SoftHSM v2.0 to the latest version

[aaf/sshsm.git] / SoftHSMv2 / m4 / acx_cppunit.m4

diff --git a/SoftHSMv2/m4/acx_cppunit.m4 b/SoftHSMv2/m4/acx_cppunit.m4
index 2720d81..1e04244 100644 (file)
--- a/SoftHSMv2/m4/acx_cppunit.m4
+++ b/SoftHSMv2/m4/acx_cppunit.m4
@@ -1,21 +1,15 @@
 AC_DEFUN([ACX_CPPUNIT],[
        AC_PATH_PROG([CPPUNIT_CONFIG], [cppunit-config])
-       AC_PATH_PROG([PKG_CONFIG], [pkg-config])
-       if test -n "${CPPUNIT_CONFIG}"; then
+       if test -n "${PKG_CONFIG}"; then
+               PKG_CHECK_MODULES([CPPUNIT], [cppunit], [], [:])
+       elif 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}])
+               AC_SUBST([CPPUNIT_CFLAGS])
+               AC_SUBST([CPPUNIT_LIBS])
        fi
-       AC_SUBST([CPPUNIT_CFLAGS])
-       AC_SUBST([CPPUNIT_LIBS])
 ])