2013-01-19 Chris Allegretta <chrisa@asty.org>
* 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-d3aeb78583b8master
parent
a149549d07
commit
66e5972c52
|
@ -6,8 +6,8 @@
|
||||||
Originally reported by dave festing.
|
Originally reported by dave festing.
|
||||||
|
|
||||||
2013-01-19 Chris Allegretta <chrisa@asty.org>
|
2013-01-19 Chris Allegretta <chrisa@asty.org>
|
||||||
* configure.ac: Make ncursesw checking dependent on the presence of ncursesw.h,
|
* configure.ac: Make ncurses checking to set $LIBS and check the ncursesw lib
|
||||||
since without the header files we can't compile.
|
actually works before defaulting to it over ncurses! Shock!
|
||||||
|
|
||||||
2013-01-13 Chris Allegretta <chrisa@asty.org>
|
2013-01-13 Chris Allegretta <chrisa@asty.org>
|
||||||
* src/utils.c (parse_num): Initalize errno before calling strtol(). Fixes issue
|
* src/utils.c (parse_num): Initalize errno before calling strtol(). Fixes issue
|
||||||
|
|
22
configure.ac
22
configure.ac
|
@ -441,17 +441,17 @@ if eval "test x$CURSES_LIB_NAME = x"; then
|
||||||
AC_CHECK_HEADERS(ncurses.h)
|
AC_CHECK_HEADERS(ncurses.h)
|
||||||
|
|
||||||
if test x$enable_utf8 != xno; then
|
if test x$enable_utf8 != xno; then
|
||||||
AC_CHECK_HEADERS(ncursesw/ncurses.h, [
|
OLDLIBS="$LIBS"
|
||||||
AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no)
|
AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no)
|
||||||
if test "x$NCURSESW_CONFIG" != xno; then
|
if test "x$NCURSESW_CONFIG" != xno; then
|
||||||
CURSES_LIB=`$NCURSESW_CONFIG --libs`
|
CURSES_LIB=`$NCURSESW_CONFIG --libs`
|
||||||
CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS"
|
LIBS="$CURSES_LIB $LIBS"
|
||||||
CURSES_LIB_NAME=ncursesw
|
CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS"
|
||||||
CURSES_LIB_WIDE=yes
|
AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
|
||||||
else
|
else
|
||||||
AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
|
AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
|
||||||
fi
|
fi
|
||||||
])
|
LIBS="$OLDLIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if eval "test x$CURSES_LIB_NAME = x"; then
|
if eval "test x$CURSES_LIB_NAME = x"; then
|
||||||
|
|
Loading…
Reference in New Issue