david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-07-27 16:12:43 +02:00 committed by Anthony Liguori
parent a6290cfdb8
commit 525061bff2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -193,7 +193,7 @@ vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h
vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h
vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) vnc.o: CFLAGS += $(VNC_TLS_CFLAGS)
vnc-tls.o: vnc-tls.c vnc.h vnc-tls.o: vnc-tls.c vnc.h

4
Makefile.target
View File

@ -456,8 +456,8 @@ adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
endif endif
ifdef CONFIG_VNC_TLS ifdef CONFIG_VNC_TLS
CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) CPPFLAGS += $(VNC_TLS_CFLAGS)
LIBS += $(CONFIG_VNC_TLS_LIBS) LIBS += $(VNC_TLS_LIBS)
endif endif
ifdef CONFIG_VNC_SASL ifdef CONFIG_VNC_SASL

4
configure vendored
View File

@ -1649,8 +1649,8 @@ if test "$mixemu" = "yes" ; then
fi fi
if test "$vnc_tls" = "yes" ; then if test "$vnc_tls" = "yes" ; then
echo "CONFIG_VNC_TLS=y" >> $config_host_mak echo "CONFIG_VNC_TLS=y" >> $config_host_mak
echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak echo "VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak
echo "#define CONFIG_VNC_TLS 1" >> $config_host_h echo "#define CONFIG_VNC_TLS 1" >> $config_host_h
fi fi
if test "$vnc_sasl" = "yes" ; then if test "$vnc_sasl" = "yes" ; then