diff mbox

[43/81] Fold VNC_TLS_LIBS into libs_softmmu

Message ID 7e580f26e81c78a54717c82515f18de0b9171bad.1249301360.git.quintela@redhat.com
State Superseded
Headers show

Commit Message

Juan Quintela Aug. 3, 2009, 12:46 p.m. UTC 
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    3 ---
 configure       |    3 +--
 2 files changed, 1 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/Makefile.target b/Makefile.target
index da8b861..b5500e4 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 e778bbc..2226695 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