gwj / at91sam9263 · Commits

Commit 60ddf53399686061b34c11bcfe650905f6e6f192

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent a900c002

remove CONFIG_ from VNC_SASL_{LIBS, FLAGS} 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
Makefile.target
  View file @60ddf53
@@ -461,8 +461,8 @@ LIBS += $(VNC_TLS_LIBS) @@ -461,8 +461,8 @@ LIBS += $(VNC_TLS_LIBS)
461 endif 461 endif
462 462
463 ifdef CONFIG_VNC_SASL 463 ifdef CONFIG_VNC_SASL
464 -CPPFLAGS += $(CONFIG_VNC_SASL_CFLAGS)  
465 -LIBS += $(CONFIG_VNC_SASL_LIBS) 464 +CPPFLAGS += $(VNC_SASL_CFLAGS)
  465 +LIBS += $(VNC_SASL_LIBS)
466 endif 466 endif
467 467
468 ifdef CONFIG_BLUEZ 468 ifdef CONFIG_BLUEZ
configure
  View file @60ddf53
@@ -1655,8 +1655,8 @@ if test &quot;$vnc_tls&quot; = &quot;yes&quot; ; then @@ -1655,8 +1655,8 @@ if test &quot;$vnc_tls&quot; = &quot;yes&quot; ; then
1655 fi 1655 fi
1656 if test "$vnc_sasl" = "yes" ; then 1656 if test "$vnc_sasl" = "yes" ; then
1657 echo "CONFIG_VNC_SASL=y" >> $config_host_mak 1657 echo "CONFIG_VNC_SASL=y" >> $config_host_mak
1658 - echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak  
1659 - echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak 1658 + echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
  1659 + echo "VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
1660 echo "#define CONFIG_VNC_SASL 1" >> $config_host_h 1660 echo "#define CONFIG_VNC_SASL 1" >> $config_host_h
1661 fi 1661 fi
1662 if test "$fnmatch" = "yes" ; then 1662 if test "$fnmatch" = "yes" ; then