Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 658390
Collapse All | Expand All

(-)a/configure.ac (-6 / +12 lines)
Lines 32-48 Link Here
32
TORRENT_WITHOUT_STATFS
32
TORRENT_WITHOUT_STATFS
33
33
34
AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
34
AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
35
AX_WITH_CURSES
35
PKG_CHECK_MODULES([CURSES],[ncursesw],[
36
36
       AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1)
37
if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
37
       ],
38
	AC_MSG_ERROR([requires either NcursesW or Ncurses library])
38
       [PKG_CHECK_MODULES([CURSES],[ncurses],[
39
fi
39
               AC_DEFINE(HAVE_NCURSES_H, 1)
40
               ],
41
               [AX_WITH_CURSES()
42
               if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
43
                       AC_MSG_ERROR([requires either NcursesW or Ncurses library])
44
               fi])
45
       ])
40
46
41
PKG_CHECK_MODULES([LIBCURL], [libcurl], , [LIBCURL_CHECK_CONFIG])
47
PKG_CHECK_MODULES([LIBCURL], [libcurl], , [LIBCURL_CHECK_CONFIG])
42
PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
48
PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
43
PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.13.7])
49
PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.13.7])
44
50
45
LIBS="$PTHREAD_LIBS $CURSES_LIB $CPPUNIT_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS"
51
LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $CPPUNIT_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS"
46
CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
52
CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
47
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
53
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
48
54

Return to bug 658390