fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-19 23:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use pkg-config for cppunit test.

Browse Source
This commit is contained in:
rakshasa
2016-10-23 08:53:11 +09:00
parent 16e1961636
commit 71a52bfac2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+5 -4
View File
@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 9, api version)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
AM_PATH_CPPUNIT(1.9.6)
AC_PROG_CXX AC_PROG_CXX
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
@@ -36,9 +35,11 @@ if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
AC_MSG_ERROR([requires either NcursesW or Ncurses library]) AC_MSG_ERROR([requires either NcursesW or Ncurses library])
fi fi
CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
LIBS="$PTHREAD_LIBS $CURSES_LIB $LIBS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS"
LIBS="$PTHREAD_LIBS $CURSES_LIB $CPPUNIT_LIBS $LIBS"
PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4, PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS"; CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";