Commit 01dd69cb authored by Jari Sundell's avatar Jari Sundell Committed by GitHub

Merge pull request #118 from rakshasa/fix-cppunit

Use pkg-config for cppunit.
parents defccf0e b8b24b58
......@@ -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.],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment