Use pkg-config for cppunit.

rakshasa · Oct 22, 2016 · b8b24b5 · b8b24b5
1 parent defccf0
commit b8b24b5
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO)
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS(config.h)
-AM_PATH_CPPUNIT(1.9.6)
 
 AC_PROG_CXX
 
@@ -60,9 +59,11 @@ CC_ATTRIBUTE_VISIBILITY
 AX_PTHREAD
 AX_CHECK_ZLIB
 
-CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
-CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
-LIBS="$PTHREAD_LIBS $LIBS"
+PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
+
+CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
+CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
+LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
 
 AC_ARG_ENABLE(openssl,
   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],