From 5817b07ee35051339f96845a328697a7441d2daf Mon Sep 17 00:00:00 2001 From: James Booth Date: Thu, 6 Mar 2014 21:32:36 +0000 Subject: [PATCH] More ncurses fixes for brew --- configure.ac | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 114f6552..b98c1791 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,6 +112,20 @@ 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 + 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],