mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fold VNC_SASL_LIBS into libs_softmmu

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
This commit is contained in:
Juan Quintela 2009-08-03 14:46:35 +02:00 committed by Anthony Liguori
parent a5e32cc912
commit fa838301c9
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.target
View File

@ -239,11 +239,7 @@ sound-obj-$(CONFIG_CS4231A) += cs4231a.o
adlib.o fmopl.o: QEMU_CFLAGS := ${QEMU_CFLAGS} -DBUILD_Y8950=0 adlib.o fmopl.o: QEMU_CFLAGS := ${QEMU_CFLAGS} -DBUILD_Y8950=0
QEMU_CFLAGS += $(VNC_TLS_CFLAGS) QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
ifdef CONFIG_VNC_SASL
QEMU_CFLAGS += $(VNC_SASL_CFLAGS) QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
LIBS += $(VNC_SASL_LIBS)
endif
ifdef CONFIG_BLUEZ ifdef CONFIG_BLUEZ
LIBS += $(BLUEZ_LIBS) LIBS += $(BLUEZ_LIBS)

3
configure vendored
View File

@ -922,7 +922,7 @@ EOF
vnc_sasl_cflags="" vnc_sasl_cflags=""
vnc_sasl_libs="-lsasl2" vnc_sasl_libs="-lsasl2"
if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
: libs_softmmu="$vnc_sasl_libs $libs_softmmu"
else else
vnc_sasl="no" vnc_sasl="no"
fi fi
@ -1632,7 +1632,6 @@ fi
if test "$vnc_sasl" = "yes" ; then if test "$vnc_sasl" = "yes" ; then
echo "CONFIG_VNC_SASL=y" >> $config_host_mak echo "CONFIG_VNC_SASL=y" >> $config_host_mak
echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
echo "VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
fi fi
if test "$fnmatch" = "yes" ; then if test "$fnmatch" = "yes" ; then
echo "CONFIG_FNMATCH=y" >> $config_host_mak echo "CONFIG_FNMATCH=y" >> $config_host_mak