diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-03 14:46:34 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-10 13:05:41 -0500 |
| commit | a5e32cc912b757c6dcd29230b4a151893ec5727e (patch) | |
| tree | 6d65dbc841e166eb10fedfeb72caba373e35aa08 | |
| parent | d2ef30d5d3563d874ff85d47bcb43cd910108f05 (diff) | |
Fold VNC_TLS_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.target | 3 | ||||
| -rwxr-xr-x | configure | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Makefile.target b/Makefile.target index 64143618c7..85a6cf7ca0 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) @@ -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 |