diff --git a/configure.ac b/configure.ac index 58166ccf..f0629038 100644 --- a/configure.ac +++ b/configure.ac @@ -36,19 +36,11 @@ if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then fi PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"]) +PKG_CHECK_MODULES([DEPENDENCIES], [libcurl >= 7.15.4 libtorrent >= 0.13.6]) -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, - CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS"; - LIBS="$LIBS $libcurl_LIBS") - -PKG_CHECK_MODULES([libtorrent], libtorrent >= 0.13.6, - CXXFLAGS="$CXXFLAGS $libtorrent_CFLAGS"; - LIBS="$LIBS $libtorrent_LIBS", - [AC_MSG_ERROR([libtorrent >= 0.13.6 not found. Install from https://github.com/rakshasa/libtorrent.git])]) +CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS" +CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS" +LIBS="$PTHREAD_LIBS $CURSES_LIB $CPPUNIT_LIBS $DEPENDENCIES_LIBS $LIBS" AC_LANG_PUSH(C++) TORRENT_WITH_XMLRPC_C