mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-10-11 08:39:21 +00:00
Revert "Merge pull request #317 from jlec/tinfo"
This reverts commitb19cf8b4ff, reversing changes made to83d7dc8964.
This commit is contained in:
+6
-12
@@ -30,21 +30,15 @@ TORRENT_WITHOUT_STATVFS
|
|||||||
TORRENT_WITHOUT_STATFS
|
TORRENT_WITHOUT_STATFS
|
||||||
|
|
||||||
AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
|
AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
|
||||||
PKG_CHECK_MODULES([CURSES],[ncursesw],[
|
AX_WITH_CURSES
|
||||||
AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1)
|
|
||||||
],
|
if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
|
||||||
[PKG_CHECK_MODULES([CURSES],[ncurses],[
|
AC_MSG_ERROR([requires either NcursesW or Ncurses library])
|
||||||
AC_DEFINE(HAVE_NCURSES_H, 1)
|
fi
|
||||||
],
|
|
||||||
[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 $CURSES_LIBS $LIBS"
|
LIBS="$PTHREAD_LIBS $CURSES_LIB $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";
|
||||||
|
|||||||
Reference in New Issue
Block a user