From: Juan Quintela <quintela@redhat.com>
Date: Mon, 27 Jul 2009 14:12:45 +0000 (+0200)
Subject: remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}
X-Git-Tag: v0.12.0-rc0~1812
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60ddf53399686061b34c11bcfe650905f6e6f192;p=thirdparty%2Fqemu.git

remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/Makefile.target b/Makefile.target
index 0b2d88515c9..43ad50fa13b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -461,8 +461,8 @@ LIBS += $(VNC_TLS_LIBS)
 endif
 
 ifdef CONFIG_VNC_SASL
-CPPFLAGS += $(CONFIG_VNC_SASL_CFLAGS)
-LIBS += $(CONFIG_VNC_SASL_LIBS)
+CPPFLAGS += $(VNC_SASL_CFLAGS)
+LIBS += $(VNC_SASL_LIBS)
 endif
 
 ifdef CONFIG_BLUEZ
diff --git a/configure b/configure
index 42519d26802..2528b2c4464 100755
--- a/configure
+++ b/configure
@@ -1655,8 +1655,8 @@ if test "$vnc_tls" = "yes" ; then
 fi
 if test "$vnc_sasl" = "yes" ; then
   echo "CONFIG_VNC_SASL=y" >> $config_host_mak
-  echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
-  echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
+  echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
+  echo "VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
   echo "#define CONFIG_VNC_SASL 1" >> $config_host_h
 fi
 if test "$fnmatch" = "yes" ; then