jlec 15/05/08 14:31:42 Added: rtorrent-0.9.4-tinfo.patch Log: Add fix for ncurses[tinfo], bug #522706 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Revision Changes Path 1.1 net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch?rev=1.1&content-type=text/plain Index: rtorrent-0.9.4-tinfo.patch =================================================================== configure.ac | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 430c15d..50ce687 100644 --- a/configure.ac +++ b/configure.ac @@ -31,15 +31,21 @@ TORRENT_WITHOUT_STATVFS() TORRENT_WITHOUT_STATFS() AX_PTHREAD([], AC_MSG_ERROR([requires pthread])) -AX_WITH_CURSES() - -if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then - AC_MSG_ERROR([requires either NcursesW or Ncurses library]) -fi +PKG_CHECK_MODULES([CURSES],[ncursesw],[ + AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1) + ], + [PKG_CHECK_MODULES([CURSES],[ncurses],[ + AC_DEFINE(HAVE_NCURSES_H, 1) + ], + [AX_WITH_CURSES() + if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then + AC_MSG_ERROR([requires either NcursesW or Ncurses library]) + fi]) + ]) CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" -LIBS="$PTHREAD_LIBS $CURSES_LIB $LIBS" +LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBS" PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4, CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";
