From 4fb036f87d71f24b4bb18d9f91ac2f5b4f6535f5 Mon Sep 17 00:00:00 2001 From: rakshasa Date: Thu, 10 Mar 2016 04:03:56 +0900 Subject: [PATCH] Revert "Merge pull request #317 from jlec/tinfo" This reverts commit b19cf8b4ff799b4c92f85501114d9d6bbc0ddb42, reversing changes made to 83d7dc896424f1dbc3618d1c88b10b2d70c52afa. --- configure.ac | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 1f3b0573..10bcda90 100644 --- a/configure.ac +++ b/configure.ac @@ -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";