Signed-off-by: Fam Zheng <f...@redhat.com>
Message-Id: <20170907082918.7299-6-f...@redhat.com>
Reviewed-by: Gerd Hoffmann <kra...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Signed-off-by: Fam Zheng <f...@redhat.com>
---
configure | 6 ++++--
ui/Makefile.objs | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index ddddfde599..df22b14259 100755
--- a/configure
+++ b/configure
@@ -3141,8 +3141,8 @@ EOF
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"
+ curses_cflags="$curses_inc $curses_cflags"
+ curses_libs="$curses_lib $curses_libs"
break
fi
done
@@ -5611,6 +5611,8 @@ if test "$cocoa" = "yes" ; then
fi
if test "$curses" = "yes" ; then
echo "CONFIG_CURSES=y" >> $config_host_mak
+ echo "CURSES_CFLAGS=$curses_cflags" >> $config_host_mak
+ echo "CURSES_LIBS=$curses_libs" >> $config_host_mak
fi
if test "$pipe2" = "yes" ; then
echo "CONFIG_PIPE2=y" >> $config_host_mak
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index a0b3c15a28..e3403b698b 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -57,3 +57,6 @@ gtk-egl.o-libs += $(OPENGL_LIBS)
shader.o-libs += $(OPENGL_LIBS)
console-gl.o-libs += $(OPENGL_LIBS)
egl-helpers.o-libs += $(OPENGL_LIBS)
+
+curses.o-cflags := $(CURSES_CFLAGS)
+curses.o-libs := $(CURSES_LIBS)
--
2.13.5
