diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-07-27 16:12:43 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-27 14:09:16 -0500 |
| commit | 525061bff2132a6833abfdeff8fd1d597addeece (patch) | |
| tree | 4a5396a228fe8447f3bcb0af6baea74c2b50151a | |
| parent | a6290cfdb8a2eacf33cd8f0f4cd59d71f2ffac3e (diff) | |
| download | qemu-525061bff2132a6833abfdeff8fd1d597addeece.tar.gz | |
remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.target | 4 | ||||
| -rwxr-xr-x | configure | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -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: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) +vnc.o: CFLAGS += $(VNC_TLS_CFLAGS) vnc-tls.o: vnc-tls.c vnc.h diff --git a/Makefile.target b/Makefile.target index f9cd42a94f..0b2d88515c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -456,8 +456,8 @@ adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 endif ifdef CONFIG_VNC_TLS -CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) -LIBS += $(CONFIG_VNC_TLS_LIBS) +CPPFLAGS += $(VNC_TLS_CFLAGS) +LIBS += $(VNC_TLS_LIBS) endif ifdef CONFIG_VNC_SASL @@ -1649,8 +1649,8 @@ if test "$mixemu" = "yes" ; then fi if test "$vnc_tls" = "yes" ; then echo "CONFIG_VNC_TLS=y" >> $config_host_mak - echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak - echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak + echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak + echo "VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak echo "#define CONFIG_VNC_TLS 1" >> $config_host_h fi if test "$vnc_sasl" = "yes" ; then |