From bc8a871ad9e1b8cb842e88139f96cc6a024d4747 Mon Sep 17 00:00:00 2001 From: James Booth Date: Thu, 6 Mar 2014 21:37:46 +0000 Subject: [PATCH] Revert "Ncurses fixes for brew" This reverts commit ca0a1e4d9dd757b915793f85f17c533f87523449. --- configure.ac | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 114f6552..ed232524 100644 --- a/configure.ac +++ b/configure.ac @@ -90,10 +90,8 @@ PKG_CHECK_MODULES([ncursesw], [ncursesw], [NCURSES_CFLAGS="$ncursesw_CFLAGS"; NCURSES_LIBS="$ncursesw_LIBS"; NCURSES="ncursesw"], [PKG_CHECK_MODULES([ncurses], [ncurses], [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([ncursesw], [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" LIBS="$LIBS $NCURSES_LIBS"