ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Using the pkg-config files of ncurses, when available. 

Patch by Mike Frysinger


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4673 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-03-24 13:42:58 +00:00
parent 55a0d76c66
commit 4172714415
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -8,6 +8,9 @@
with warnings enabled by default, to help prevent issues from with warnings enabled by default, to help prevent issues from
silently creeping in. Patch by Mike Frysinger. silently creeping in. Patch by Mike Frysinger.
* src/{nano,move,winio}.c - Fix a few compiler warnings. * src/{nano,move,winio}.c - Fix a few compiler warnings.
* configure.ac - Newer ncurses installs include pkg-config files
which tell us the right -I/-L paths we need, so default to that
before trying the legacy ways. Patch by Mike Frysinger.
2014-03-23 Benno Schulenberg <bensberg@justemail.net> 2014-03-23 Benno Schulenberg <bensberg@justemail.net>
* src/rcfile.c (parse_keybinding, parse_unbinding) - Improve a * src/rcfile.c (parse_keybinding, parse_unbinding) - Improve a

18
configure.ac
View File

@ -35,6 +35,7 @@ AC_PROG_CC
AC_PROG_LN_S AC_PROG_LN_S
AC_ISC_POSIX AC_ISC_POSIX
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
PKG_PROG_PKG_CONFIG
dnl Internationalization macros. dnl Internationalization macros.
@ -440,6 +441,23 @@ AC_FUNC_VPRINTF
AC_CHECK_FUNCS(getopt_long) AC_CHECK_FUNCS(getopt_long)
dnl Checks for libraries. dnl Checks for libraries.
if eval "test x$CURSES_LIB_NAME = x"; then
if test x$enable_utf8 != xno; then
PKG_CHECK_MODULES([NCURSESW], [ncursesw], [
CURSES_LIB=$NCURSESW_LIBS
CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS"
CURSES_LIB_NAME=ncursesw
CURSES_LIB_WIDE=yes
], [:])
else
PKG_CHECK_MODULES([NCURSES], [ncurses], [
CURSES_LIB=$NCURSES_LIBS
CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS"
CURSES_LIB_NAME=ncurses
], [:])
fi
fi
if eval "test x$CURSES_LIB_NAME = x"; then if eval "test x$CURSES_LIB_NAME = x"; then
AC_CHECK_HEADERS(ncurses.h) AC_CHECK_HEADERS(ncurses.h)