fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-15 13:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try use pkg-config to detect ncurses libraries

Browse Source 
Modern ncurses version provide a pkg-config interface, so let's try to
use it first. This also helps when ncurses provides functions inside
libtinfo.so and thus needs to be linked against it as well.

Signed-off-by: Justin Lecher <jlec@gentoo.org>
This commit is contained in:
Justin Lecher
2015-07-29 09:32:37 +02:00
parent 50d6437792
commit 9ba4d1d92e
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+12 -6
View File
@@ -30,15 +30,21 @@ TORRENT_WITHOUT_STATVFS
TORRENT_WITHOUT_STATFS TORRENT_WITHOUT_STATFS
AX_PTHREAD([], AC_MSG_ERROR([requires pthread])) AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
AX_WITH_CURSES PKG_CHECK_MODULES([CURSES],[ncursesw],[
AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1)
if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then ],
AC_MSG_ERROR([requires either NcursesW or Ncurses library]) [PKG_CHECK_MODULES([CURSES],[ncurses],[
fi 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" CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
CXXFLAGS="$CXXFLAGS $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, PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS"; CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";