mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: fix includes for VNC

Browse Source 
vnc-tls.h is included by vnc.h, and it includes gnutls/gnutls.h.
Hence, GnuTLS header files are needed by all files that include
vnc.h, most notably qmp.c.  Move these flags to QEMU_CFLAGS for
simplicity.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Paolo Bonzini 2012-12-20 12:29:19 +01:00 committed by Blue Swirl
parent bb5801f551
commit ca273d58d8
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.target
View File

@ -120,11 +120,6 @@ obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o
obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o
LIBS+=-lz LIBS+=-lz
QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
QEMU_CFLAGS += $(VNC_JPEG_CFLAGS)
QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
# xen support # xen support
obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o
obj-$(CONFIG_NO_XEN) += xen-stub.o obj-$(CONFIG_NO_XEN) += xen-stub.o

7
configure vendored
View File

@ -1712,6 +1712,7 @@ EOF
if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
vnc_tls=yes vnc_tls=yes
libs_softmmu="$vnc_tls_libs $libs_softmmu" libs_softmmu="$vnc_tls_libs $libs_softmmu"
QEMU_CFLAGS="$QEMU_CFLAGS $vnc_tls_cflags"
else else
if test "$vnc_tls" = "yes" ; then if test "$vnc_tls" = "yes" ; then
feature_not_found "vnc-tls" feature_not_found "vnc-tls"
@ -1734,6 +1735,7 @@ EOF
if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
vnc_sasl=yes vnc_sasl=yes
libs_softmmu="$vnc_sasl_libs $libs_softmmu" libs_softmmu="$vnc_sasl_libs $libs_softmmu"
QEMU_CFLAGS="$QEMU_CFLAGS $vnc_sasl_cflags"
else else
if test "$vnc_sasl" = "yes" ; then if test "$vnc_sasl" = "yes" ; then
feature_not_found "vnc-sasl" feature_not_found "vnc-sasl"
@ -1755,6 +1757,7 @@ EOF
if compile_prog "$vnc_jpeg_cflags" "$vnc_jpeg_libs" ; then if compile_prog "$vnc_jpeg_cflags" "$vnc_jpeg_libs" ; then
vnc_jpeg=yes vnc_jpeg=yes
libs_softmmu="$vnc_jpeg_libs $libs_softmmu" libs_softmmu="$vnc_jpeg_libs $libs_softmmu"
QEMU_CFLAGS="$QEMU_CFLAGS $vnc_jpeg_cflags"
else else
if test "$vnc_jpeg" = "yes" ; then if test "$vnc_jpeg" = "yes" ; then
feature_not_found "vnc-jpeg" feature_not_found "vnc-jpeg"
@ -3377,19 +3380,15 @@ if test "$vnc" = "yes" ; then
fi fi
if test "$vnc_tls" = "yes" ; then if test "$vnc_tls" = "yes" ; then
echo "CONFIG_VNC_TLS=y" >> $config_host_mak echo "CONFIG_VNC_TLS=y" >> $config_host_mak
echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
fi fi
if test "$vnc_sasl" = "yes" ; then if test "$vnc_sasl" = "yes" ; then
echo "CONFIG_VNC_SASL=y" >> $config_host_mak echo "CONFIG_VNC_SASL=y" >> $config_host_mak
echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
fi fi
if test "$vnc_jpeg" = "yes" ; then if test "$vnc_jpeg" = "yes" ; then
echo "CONFIG_VNC_JPEG=y" >> $config_host_mak echo "CONFIG_VNC_JPEG=y" >> $config_host_mak
echo "VNC_JPEG_CFLAGS=$vnc_jpeg_cflags" >> $config_host_mak
fi fi
if test "$vnc_png" = "yes" ; then if test "$vnc_png" = "yes" ; then
echo "CONFIG_VNC_PNG=y" >> $config_host_mak echo "CONFIG_VNC_PNG=y" >> $config_host_mak
echo "VNC_PNG_CFLAGS=$vnc_png_cflags" >> $config_host_mak
fi fi
if test "$fnmatch" = "yes" ; then if test "$fnmatch" = "yes" ; then
echo "CONFIG_FNMATCH=y" >> $config_host_mak echo "CONFIG_FNMATCH=y" >> $config_host_mak

1
ui/Makefile.objs
View File

@ -14,6 +14,5 @@ common-obj-$(CONFIG_CURSES) += curses.o
common-obj-$(CONFIG_VNC) += $(vnc-obj-y) common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
$(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) $(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS)
$(obj)/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
$(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m $(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m