From fa838301c9a19e916c198a8a2fea11c52d072519 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 3 Aug 2009 14:46:35 +0200 Subject: [PATCH] Fold VNC_SASL_LIBS into libs_softmmu Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori Message-Id: --- Makefile.target | 4 ---- configure | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index 85a6cf7ca0..9878c6494a 100644 --- 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 b7492dfb25..28fafd8748 100755 --- 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