Fold VNC_SASL_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 85a6cf7ca05611037abf34add990d6ff3e855b3b..9878c6494a24410c9048356365ed3971902c5869 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -239,11 +239,7 @@ sound-obj-$(CONFIG_CS4231A) += cs4231a.o
 adlib.o fmopl.o: QEMU_CFLAGS := ${QEMU_CFLAGS} -DBUILD_Y8950=0
 
 QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
-
-ifdef CONFIG_VNC_SASL
 QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
-LIBS += $(VNC_SASL_LIBS)
-endif
 
 ifdef CONFIG_BLUEZ
 LIBS += $(BLUEZ_LIBS)

diff --git a/configure b/configure
index b7492dfb2581c62bc2c6fcdf074a8b9569261a39..28fafd8748f06a023a8fcdd67e99c8bacd1a1b13 100755 (executable)
--- a/configure
+++ b/configure
@@ -922,7 +922,7 @@ EOF
     vnc_sasl_cflags=""
     vnc_sasl_libs="-lsasl2"
     if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
-       :
+       libs_softmmu="$vnc_sasl_libs $libs_softmmu"
     else
        vnc_sasl="no"
     fi
@@ -1632,7 +1632,6 @@ fi
 if test "$vnc_sasl" = "yes" ; then
   echo "CONFIG_VNC_SASL=y" >> $config_host_mak
   echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
-  echo "VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
 fi
 if test "$fnmatch" = "yes" ; then
   echo "CONFIG_FNMATCH=y" >> $config_host_mak