Fold VNC_TLS_LIBS into libs_softmmu

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:

diff --git a/Makefile.target b/Makefile.target
index 64143618c7f83f4ff0aba7e1c1b7f2e34de9e55b..85a6cf7ca05611037abf34add990d6ff3e855b3b 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -238,10 +238,7 @@ sound-obj-$(CONFIG_CS4231A) += cs4231a.o
 
 adlib.o fmopl.o: QEMU_CFLAGS := ${QEMU_CFLAGS} -DBUILD_Y8950=0
 
-ifdef CONFIG_VNC_TLS
 QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
-LIBS += $(VNC_TLS_LIBS)
-endif
 
 ifdef CONFIG_VNC_SASL
 QEMU_CFLAGS += $(VNC_SASL_CFLAGS)

diff --git a/configure b/configure
index f1dd16cb097834e3fe93e954749893e96126484f..b7492dfb2581c62bc2c6fcdf074a8b9569261a39 100755 (executable)
--- a/configure
+++ b/configure
@@ -904,7 +904,7 @@ EOF
     vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null`
     vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`
     if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
-       :
+       libs_softmmu="$vnc_tls_libs $libs_softmmu"
     else
        vnc_tls="no"
     fi
@@ -1628,7 +1628,6 @@ fi
 if test "$vnc_tls" = "yes" ; then
   echo "CONFIG_VNC_TLS=y" >> $config_host_mak
   echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
-  echo "VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak
 fi
 if test "$vnc_sasl" = "yes" ; then
   echo "CONFIG_VNC_SASL=y" >> $config_host_mak