From 29479ca7f5ae6017a79e6a7fa6764b590b123076 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Sat, 19 Jan 2013 07:18:29 +0000 Subject: [PATCH] 2013-01-19 Chris Allegretta * configure.ac: Make ncursesw checking dependent on the presence of ncursesw.h, since without the header files we can't compile. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4564 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 ++++ configure.ac | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index af77bda6..85622029 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-01-19 Chris Allegretta + * configure.ac: Make ncursesw checking dependent on the presence of ncursesw.h, + since without the header files we can't compile. + 2013-01-13 Chris Allegretta * src/utils.c (parse_num): Initalize errno before calling strtol(). Fixes issue where trying to go to a line number too long will break legitimate goto-lines diff --git a/configure.ac b/configure.ac index c6c5e523..c1eb123c 100644 --- a/configure.ac +++ b/configure.ac @@ -441,16 +441,17 @@ if eval "test x$CURSES_LIB_NAME = x"; then AC_CHECK_HEADERS(ncurses.h) if test x$enable_utf8 != xno; then - AC_CHECK_HEADERS(ncursesw/ncurses.h) - AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no) - if test "x$NCURSESW_CONFIG" != xno; then - CURSES_LIB=`$NCURSESW_CONFIG --libs` - CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS" - CURSES_LIB_NAME=ncursesw - CURSES_LIB_WIDE=yes - else - AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) - fi + AC_CHECK_HEADERS(ncursesw/ncurses.h, [ + AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no) + if test "x$NCURSESW_CONFIG" != xno; then + CURSES_LIB=`$NCURSESW_CONFIG --libs` + CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS" + CURSES_LIB_NAME=ncursesw + CURSES_LIB_WIDE=yes + else + AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) + fi + ]) fi if eval "test x$CURSES_LIB_NAME = x"; then