diff options
author | James Booth <boothj5@gmail.com> | 2014-03-06 21:37:40 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2014-03-06 21:37:40 +0000 |
commit | 1588106e912d2338fe19689aaf4536de1860b94f (patch) | |
tree | 0e9bdcc26d07debe9c1df9e6c41953550f5d0a22 | |
parent | 5817b07ee35051339f96845a328697a7441d2daf (diff) | |
download | profani-tty-1588106e912d2338fe19689aaf4536de1860b94f.tar.gz |
Revert "More ncurses fixes for brew"
This reverts commit 5817b07ee35051339f96845a328697a7441d2daf.
-rw-r--r-- | configure.ac | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index b98c1791..114f6552 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,7 @@ PKG_CHECK_MODULES([ncursesw], [ncursesw], [NCURSES_CFLAGS="$ncurses_CFLAGS"; NCURSES_LIBS="$ncurses_LIBS"; NCURSES="ncurses"], [AC_CHECK_LIB([ncursesw], [main], [LIBS="-lncursesw $LIBS" AC_DEFINE([HAVE_LIBNCURSESW], [1], [have ncursesw]) NCURSES_CFLAGS="$ncursesw_CFLAGS" NCURSES_LIBS="$ncursesw_LIBS" NCURSES="ncursesw"], - [AC_CHECK_LIB([ncurses], [main], + [AC_CHECK_LIB([ncurses], [main], [], [LIBS="-lncurses $LIBS" AC_DEFINE([HAVE_LIBNCURSES], [1], [have ncurses]) NCURSES_CFLAGS="$ncurses_CFLAGS" NCURSES_LIBS="$ncurses_LIBS" NCURSES="ncurses"], [AC_MSG_ERROR([ncurses is required for profanity])])])])]) AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS" @@ -112,20 +112,6 @@ AC_CACHE_CHECK([for wget_wch support in $NCURSES], ncurses_cv_wget_wch, [ncurses_cv_wget_wch=yes], [ncurses_cv_wget_wch=no]) ]) - -AS_IF([test "x$ncurses_cv_wget_wch" = xno], [ - AC_CACHE_CHECK([for wget_wch support in $NCURSES], ncurses_cv_wget_wch, - [AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <ncursesw/ncurses.h> - int main() { - (void)wget_wch(NULL, NULL); - return 0; - } - ])], - [ncurses_cv_wget_wch=yes], - [ncurses_cv_wget_wch=no]) - ])]) - CFLAGS="$CFLAGS_RESTORE" AS_IF([test "x$ncurses_cv_wget_wch" != xyes], |