From 66e5972c52cd33514e2cdf69e94a04d266476809 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Mon, 21 Jan 2013 03:36:18 +0000 Subject: [PATCH] 2013-01-19 Chris Allegretta * configure.ac: Make ncurses checking to set $LIBS and check the ncursesw lib actually works before defaulting to it over ncurses! Shock! git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4567 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 ++-- configure.ac | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27962ce5..5fda6737 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,8 +6,8 @@ Originally reported by dave festing. 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. + * configure.ac: Make ncurses checking to set $LIBS and check the ncursesw lib + actually works before defaulting to it over ncurses! Shock! 2013-01-13 Chris Allegretta * src/utils.c (parse_num): Initalize errno before calling strtol(). Fixes issue diff --git a/configure.ac b/configure.ac index c1489f9c..6db0b92c 100644 --- a/configure.ac +++ b/configure.ac @@ -441,17 +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 - ]) + OLDLIBS="$LIBS" + AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no) + if test "x$NCURSESW_CONFIG" != xno; then + CURSES_LIB=`$NCURSESW_CONFIG --libs` + LIBS="$CURSES_LIB $LIBS" + CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS" + AC_CHECK_LIB(ncursesw, get_wch, [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 + LIBS="$OLDLIBS" fi if eval "test x$CURSES_LIB_NAME = x"; then -- 2.39.5