[Qemu-devel] [PATCH 08/20] fold VNC_SASL_CFLAGS into CPPCFLAGS

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile.target |    4 ----
 configure       |    7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 7c81a27..601e97e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -414,10 +414,6 @@ ifdef CONFIG_ADLIB
 adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
 endif

-ifdef CONFIG_VNC_SASL
-CPPFLAGS += $(VNC_SASL_CFLAGS)
-endif
-
 # xen backend driver support
 obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o

diff --git a/configure b/configure
index bd4436d..1b5f30b 100755
--- a/configure
+++ b/configure
@@ -987,9 +987,10 @@ EOF
     vnc_sasl_libs="-lsasl2"
     if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_sasl_cflags $TMPC \
            $vnc_sasl_libs 2> /dev/null > /dev/null ; then
-       :
+        CPPFLAGS="$CPPFLAGS $vnc_sasl_cflags"
+        LIBS="$LIBS $vnc_sasl_libs"
     else
-       vnc_sasl="no"
+        vnc_sasl="no"
     fi
 fi

@@ -1659,9 +1660,7 @@ if test "$vnc_tls" = "yes" ; then
 fi
 if test "$vnc_sasl" = "yes" ; then
   echo "CONFIG_VNC_SASL=y" >> $config_host_mak
-  echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
   echo "#define CONFIG_VNC_SASL 1" >> $config_host_h
-  LIBS="$LIBS $vnc_sasl_libs"
 fi
 if test "$fnmatch" = "yes" ; then
   echo "#define HAVE_FNMATCH_H 1" >> $config_host_h
-- 
1.6.2.5