From 16c96eda109370d21ce60a7adb3285b57dabdb88 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Wed, 29 Mar 2017 22:06:56 +0200 Subject: [PATCH] Fix #7: Fix configure --enable-termcap Improper handling of AC_ARG_ENABLE() causes the configure script to always enable CONFIG_USE_TERMCAP. Signed-off-by: Joachim Nilsson --- configure.ac | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index be34396..af9f50a 100644 --- a/configure.ac +++ b/configure.ac @@ -65,18 +65,19 @@ AC_ARG_ENABLE(terminal-bell, AC_DEFINE([CONFIG_TERMINAL_BELL], 1, [Define to enable terminal bell on completion.])) AC_ARG_ENABLE(termcap, - [AS_HELP_STRING([--enable-termcap], [Use termcap library to query terminal size.])], - AC_DEFINE([CONFIG_USE_TERMCAP], 1, [Define to use the termcap library for terminal size.])) + AS_HELP_STRING([--enable-termcap], [Use termcap library to query terminal size.])) # Check for a termcap compatible library if enabled -AS_IF([test "$enable_termcap" != no], - AC_CHECK_LIB(termcap, tgetent, , [ - AC_CHECK_LIB(tinfo, tgetent, , [ - AC_CHECK_LIB(curses, tgetent, , [ - AC_CHECK_LIB(ncurses, tgetent, , [ - AC_MSG_ERROR([Cannot find a termcap capable library, try installing Ncurses.])]) - ]) - ]) - ])) +AS_IF([test "x$enable_termcap" = "xyes"], + AC_DEFINE([CONFIG_USE_TERMCAP], 1, [Define to use the termcap library for terminal size.]) + AC_CHECK_LIB(termcap, tgetent, , [ + AC_CHECK_LIB(tinfo, tgetent, , [ + AC_CHECK_LIB(curses, tgetent, , [ + AC_CHECK_LIB(ncurses, tgetent, , [ + AC_MSG_ERROR([Cannot find a termcap capable library, try installing Ncurses.])]) + ]) + ]) + ])) +# Generate all files AC_OUTPUT