summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-03 14:46:35 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:05:41 -0500
commitfa838301c9a19e916c198a8a2fea11c52d072519 (patch)
treeb1248ca0a941e970d98722177b3e1ba94594703e
parenta5e32cc912b757c6dcd29230b4a151893ec5727e (diff)
downloadhqemu-fa838301c9a19e916c198a8a2fea11c52d072519.zip
hqemu-fa838301c9a19e916c198a8a2fea11c52d072519.tar.gz
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:
-rw-r--r--Makefile.target4
-rwxr-xr-xconfigure3
2 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.target b/Makefile.target
index 85a6cf7..9878c64 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 b7492df..28fafd8 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
OpenPOWER on IntegriCloud