Revert "Merge pull request #317 from jlec/tinfo"

This reverts commit b19cf8b4ff, reversing
changes made to 83d7dc8964.
This commit is contained in:
rakshasa
2016-03-10 04:03:56 +09:00
parent 6a8d332b4c
commit 4fb036f87d
+6 -12
View File
@@ -30,21 +30,15 @@ TORRENT_WITHOUT_STATVFS
TORRENT_WITHOUT_STATFS
AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
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])
])
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 $CURSES_LIBS $LIBS"
LIBS="$PTHREAD_LIBS $CURSES_LIB $LIBS"
PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";