[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/5] curses: Use cursesw instead of curses
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PATCH 2/5] curses: Use cursesw instead of curses |
Date: |
Sat, 15 Oct 2016 21:53:05 +0200 |
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>
---
configure | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index 7d083bd..29649d9 100755
--- a/configure
+++ b/configure
@@ -2890,27 +2890,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
--
2.9.3
- [Qemu-devel] [PATCH 0/5] curses: wide character support, Samuel Thibault, 2016/10/15
- [Qemu-devel] [PATCH 5/5] curses: support wide input, Samuel Thibault, 2016/10/15
- [Qemu-devel] [PATCH 1/5] curses: fix left/right arrow translation, Samuel Thibault, 2016/10/15
- [Qemu-devel] [PATCH 4/5] curses: add option to specify VGA font encoding, Samuel Thibault, 2016/10/15
- [Qemu-devel] [PATCH 2/5] curses: Use cursesw instead of curses,
Samuel Thibault <=
- [Qemu-devel] [PATCH 3/5] curses: use wide output functions, Samuel Thibault, 2016/10/15
- Re: [Qemu-devel] [PATCH 0/5] curses: wide character support, Samuel Thibault, 2016/10/25