fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-07 14:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed libtinfow detection.

Browse Source
This commit is contained in:
rakshasa
2012-02-27 17:40:08 +09:00
parent d8f41a28fa
commit 4ff2483f07
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/ax_with_curses.m4
+5 -5
View File
@@ -317,14 +317,14 @@ AC_DEFUN([AX_WITH_CURSES], [
AC_MSG_WARN([could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h]) AC_MSG_WARN([could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h])
]) ])
dnl Test if we need to explicitly link against -linfow. dnl Test if we need to explicitly link against -ltinfow.
AC_CACHE_CHECK([if NcursesW wide-character info library is linked properly], [ax_cv_ncurses_compiled], [ AC_CACHE_CHECK([if NcursesW wide-character info library is linked properly], [ax_cv_ncurses_compiled], [
LIBS="$ax_saved_LIBS $CURSES_LIB" LIBS="$ax_saved_LIBS $CURSES_LIB"
AC_LINK_IFELSE([AC_LANG_CALL([], [keypad])], AC_LINK_IFELSE([AC_LANG_CALL([], [keypad])],
[ax_cv_ncurses_compiled=yes], [ax_cv_ncurses_compiled=no]) [ax_cv_ncurses_compiled=yes], [ax_cv_ncurses_compiled=no])
LIBS="$LIBS -linfow" LIBS="$LIBS -ltinfow"
AC_LINK_IFELSE([AC_LANG_CALL([], [keypad])], AC_LINK_IFELSE([AC_LANG_CALL([], [keypad])],
[ax_cv_info_compiled=yes], [ax_cv_info_compiled=no]) [ax_cv_info_compiled=yes], [ax_cv_info_compiled=no])
@@ -333,12 +333,12 @@ AC_DEFUN([AX_WITH_CURSES], [
]) ])
AS_IF([test "x$ax_cv_ncurses_compiled" = xno && test "x$ax_cv_info_compiled" = xno], [ AS_IF([test "x$ax_cv_ncurses_compiled" = xno && test "x$ax_cv_info_compiled" = xno], [
AC_MSG_ERROR([could not link ncursesw with/without infow]) AC_MSG_ERROR([could not link ncursesw with/without tinfow])
]) ])
AS_IF([test "x$ax_cv_ncurses_compiled" = xno && test "x$ax_cv_info_compiled" = xyes], [ AS_IF([test "x$ax_cv_ncurses_compiled" = xno && test "x$ax_cv_info_compiled" = xyes], [
AC_MSG_RESULT([adding libinfow]) AC_MSG_RESULT([adding libtinfow])
CURSES_LIB="$CURSES_LIB -linfow" CURSES_LIB="$CURSES_LIB -ltinfow"
]) ])
]) ])
]) ])
scripts/common.m4
+1 -1
View File
@@ -185,7 +185,7 @@ AC_DEFUN([TORRENT_CHECK_POPCOUNT], [
AC_MSG_CHECKING(for __builtin_popcount) AC_MSG_CHECKING(for __builtin_popcount)
AC_COMPILE_IFELSE([AC_LANG_SOURCE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
void f() { __builtin_popcount(0); } int f() { return __builtin_popcount(0); }
])], ])],
[ [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)