[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses |
Date: |
Fri, 28 Oct 2016 14:11:38 +0200 |
From: Samuel Thibault <address@hidden>
Use ncursesw package instead of curses on non-mingw, and check a few
functions.
Also take cflags from pkg-config, since cursesw headers may be in a
separate, non-default directory.
Signed-off-by: Samuel Thibault <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
configure | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index 8e10059..5e44469 100755
--- a/configure
+++ b/configure
@@ -2917,27 +2917,38 @@ fi
# curses probe
if test "$curses" != "no" ; then
if test "$mingw32" = "yes" ; then
- curses_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
+ curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
+ curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
else
- curses_list="$($pkg_config --libs ncurses 2>/dev/null):-lncurses:-lcurses"
+ curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):"
+ curses_lib_list="$($pkg_config --libs ncursesw
2>/dev/null):-lncursesw:-lcursesw"
fi
curses_found=no
cat > $TMPC << EOF
+#include <locale.h>
#include <curses.h>
+#include <wchar.h>
int main(void) {
const char *s = curses_version();
+ wchar_t wch = L'w';
+ setlocale(LC_ALL, "");
resize_term(0, 0);
+ addwstr(L"wide chars\n");
+ addnwstr(&wch, 1);
return s != 0;
}
EOF
IFS=:
- for curses_lib in $curses_list; do
- unset IFS
- if compile_prog "" "$curses_lib" ; then
- curses_found=yes
- libs_softmmu="$curses_lib $libs_softmmu"
- break
- fi
+ for curses_inc in $curses_inc_list; do
+ for curses_lib in $curses_lib_list; do
+ unset IFS
+ if compile_prog "$curses_inc" "$curses_lib" ; then
+ curses_found=yes
+ QEMU_CFLAGS="$curses_inc $QEMU_CFLAGS"
+ libs_softmmu="$curses_lib $libs_softmmu"
+ break
+ fi
+ done
done
unset IFS
if test "$curses_found" = "yes" ; then
--
1.8.3.1
- [Qemu-devel] [PULL 0/6] ui patch queue., Gerd Hoffmann, 2016/10/28
- [Qemu-devel] [PULL 3/6] gtk: fix compilation warning with gtk 3.22.2, Gerd Hoffmann, 2016/10/28
- [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Cornelia Huck, 2016/10/31
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Samuel Thibault, 2016/10/31
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Samuel Thibault, 2016/10/31
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Cornelia Huck, 2016/10/31
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Samuel Thibault, 2016/10/31
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Samuel Thibault, 2016/10/31
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Cornelia Huck, 2016/10/31
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Samuel Thibault, 2016/10/31
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Cornelia Huck, 2016/10/31
- Re: [Qemu-devel] [PULL 6/6] curses: Use cursesw instead of curses, Samuel Thibault, 2016/10/31