david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fold VNC_TLS_LIBS into libs_softmmu

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
This commit is contained in:
Juan Quintela 2009-08-03 14:46:34 +02:00 committed by Anthony Liguori
parent d2ef30d5d3
commit a5e32cc912
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.target
View File

@ -238,10 +238,7 @@ sound-obj-$(CONFIG_CS4231A) += cs4231a.o
adlib.o fmopl.o: QEMU_CFLAGS := ${QEMU_CFLAGS} -DBUILD_Y8950=0 adlib.o fmopl.o: QEMU_CFLAGS := ${QEMU_CFLAGS} -DBUILD_Y8950=0
ifdef CONFIG_VNC_TLS
QEMU_CFLAGS += $(VNC_TLS_CFLAGS) QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
LIBS += $(VNC_TLS_LIBS)
endif
ifdef CONFIG_VNC_SASL ifdef CONFIG_VNC_SASL
QEMU_CFLAGS += $(VNC_SASL_CFLAGS) QEMU_CFLAGS += $(VNC_SASL_CFLAGS)

3
configure vendored
View File

@ -904,7 +904,7 @@ EOF
vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null` vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null`
vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null` vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`
if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
: libs_softmmu="$vnc_tls_libs $libs_softmmu"
else else
vnc_tls="no" vnc_tls="no"
fi fi
@ -1628,7 +1628,6 @@ 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 echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
echo "VNC_TLS_LIBS=$vnc_tls_libs" >> $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