[Qemu-commits] [COMMIT a5e32cc] Fold VNC_TLS_LIBS into libs_softmmu

[Anthony Liguori]

From: Juan Quintela <address@hidden>

Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Message-Id: 

diff --git a/Makefile.target b/Makefile.target
index 6414361..85a6cf7 100644
--- 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 f1dd16c..b7492df 100755
--- 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