Commit e34af2ced511eb8b8b4a62521ebeb7279ed66729

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 6ef859b3

move CONFIG_* values from yes to y

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing 1 changed file with 37 additions and 37 deletions
configure
... ... @@ -1593,7 +1593,7 @@ if test &quot;$bigendian&quot; = &quot;yes&quot; ; then
1593 1593 fi
1594 1594 echo "#define HOST_LONG_BITS $hostlongbits" >> $config_h
1595 1595 if test "$mingw32" = "yes" ; then
1596   - echo "CONFIG_WIN32=yes" >> $config_mak
  1596 + echo "CONFIG_WIN32=y" >> $config_mak
1597 1597 echo "#define CONFIG_WIN32 1" >> $config_h
1598 1598 else
1599 1599 cat > $TMPC << EOF
... ... @@ -1619,17 +1619,17 @@ if [ &quot;$openbsd&quot; = &quot;yes&quot; ] ; then
1619 1619 fi
1620 1620  
1621 1621 if test "$darwin" = "yes" ; then
1622   - echo "CONFIG_DARWIN=yes" >> $config_mak
  1622 + echo "CONFIG_DARWIN=y" >> $config_mak
1623 1623 echo "#define CONFIG_DARWIN 1" >> $config_h
1624 1624 fi
1625 1625  
1626 1626 if test "$aix" = "yes" ; then
1627   - echo "CONFIG_AIX=yes" >> $config_mak
  1627 + echo "CONFIG_AIX=y" >> $config_mak
1628 1628 echo "#define CONFIG_AIX 1" >> $config_h
1629 1629 fi
1630 1630  
1631 1631 if test "$solaris" = "yes" ; then
1632   - echo "CONFIG_SOLARIS=yes" >> $config_mak
  1632 + echo "CONFIG_SOLARIS=y" >> $config_mak
1633 1633 echo "#define HOST_SOLARIS $solarisrev" >> $config_h
1634 1634 if test "$needs_libsunmath" = "yes" ; then
1635 1635 echo "NEEDS_LIBSUNMATH=yes" >> $config_mak
... ... @@ -1637,7 +1637,7 @@ if test &quot;$solaris&quot; = &quot;yes&quot; ; then
1637 1637 fi
1638 1638 fi
1639 1639 if test -n "$sparc_cpu"; then
1640   - echo "CONFIG__sparc_${sparc_cpu}__=yes" >> $config_mak
  1640 + echo "CONFIG__sparc_${sparc_cpu}__=y" >> $config_mak
1641 1641 echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h
1642 1642 fi
1643 1643 if test "$gprof" = "yes" ; then
... ... @@ -1645,31 +1645,31 @@ if test &quot;$gprof&quot; = &quot;yes&quot; ; then
1645 1645 echo "#define HAVE_GPROF 1" >> $config_h
1646 1646 fi
1647 1647 if test "$static" = "yes" ; then
1648   - echo "CONFIG_STATIC=yes" >> $config_mak
  1648 + echo "CONFIG_STATIC=y" >> $config_mak
1649 1649 echo "#define CONFIG_STATIC 1" >> $config_h
1650 1650 fi
1651 1651 if test $profiler = "yes" ; then
1652 1652 echo "#define CONFIG_PROFILER 1" >> $config_h
1653 1653 fi
1654 1654 if test "$slirp" = "yes" ; then
1655   - echo "CONFIG_SLIRP=yes" >> $config_mak
  1655 + echo "CONFIG_SLIRP=y" >> $config_mak
1656 1656 echo "#define CONFIG_SLIRP 1" >> $config_h
1657 1657 fi
1658 1658 if test "$vde" = "yes" ; then
1659   - echo "CONFIG_VDE=yes" >> $config_mak
  1659 + echo "CONFIG_VDE=y" >> $config_mak
1660 1660 echo "#define CONFIG_VDE 1" >> $config_h
1661 1661 echo "VDE_LIBS=-lvdeplug" >> $config_mak
1662 1662 fi
1663 1663 for card in $audio_card_list; do
1664 1664 def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`
1665   - echo "$def=yes" >> $config_mak
  1665 + echo "$def=y" >> $config_mak
1666 1666 echo "#define $def 1" >> $config_h
1667 1667 done
1668 1668 echo "#define AUDIO_DRIVERS \\" >> $config_h
1669 1669 for drv in $audio_drv_list; do
1670 1670 echo " &${drv}_audio_driver, \\" >>$config_h
1671 1671 def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
1672   - echo "$def=yes" >> $config_mak
  1672 + echo "$def=y" >> $config_mak
1673 1673 if test "$drv" = "fmod"; then
1674 1674 echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
1675 1675 echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
... ... @@ -1679,17 +1679,17 @@ for drv in $audio_drv_list; do
1679 1679 done
1680 1680 echo "" >>$config_h
1681 1681 if test "$mixemu" = "yes" ; then
1682   - echo "CONFIG_MIXEMU=yes" >> $config_mak
  1682 + echo "CONFIG_MIXEMU=y" >> $config_mak
1683 1683 echo "#define CONFIG_MIXEMU 1" >> $config_h
1684 1684 fi
1685 1685 if test "$vnc_tls" = "yes" ; then
1686   - echo "CONFIG_VNC_TLS=yes" >> $config_mak
  1686 + echo "CONFIG_VNC_TLS=y" >> $config_mak
1687 1687 echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
1688 1688 echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
1689 1689 echo "#define CONFIG_VNC_TLS 1" >> $config_h
1690 1690 fi
1691 1691 if test "$vnc_sasl" = "yes" ; then
1692   - echo "CONFIG_VNC_SASL=yes" >> $config_mak
  1692 + echo "CONFIG_VNC_SASL=y" >> $config_mak
1693 1693 echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak
1694 1694 echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak
1695 1695 echo "#define CONFIG_VNC_SASL 1" >> $config_h
... ... @@ -1718,7 +1718,7 @@ else
1718 1718 fi
1719 1719 if test "$sdl1" = "yes" ; then
1720 1720 echo "#define CONFIG_SDL 1" >> $config_h
1721   - echo "CONFIG_SDL=yes" >> $config_mak
  1721 + echo "CONFIG_SDL=y" >> $config_mak
1722 1722 if test "$target_softmmu" = "no" -o "$static" = "yes"; then
1723 1723 echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
1724 1724 elif test "$sdl_x11" = "yes" ; then
... ... @@ -1734,11 +1734,11 @@ if test &quot;$sdl1&quot; = &quot;yes&quot; ; then
1734 1734 fi
1735 1735 if test "$cocoa" = "yes" ; then
1736 1736 echo "#define CONFIG_COCOA 1" >> $config_h
1737   - echo "CONFIG_COCOA=yes" >> $config_mak
  1737 + echo "CONFIG_COCOA=y" >> $config_mak
1738 1738 fi
1739 1739 if test "$curses" = "yes" ; then
1740 1740 echo "#define CONFIG_CURSES 1" >> $config_h
1741   - echo "CONFIG_CURSES=yes" >> $config_mak
  1741 + echo "CONFIG_CURSES=y" >> $config_mak
1742 1742 if test "$ncurses" = "yes" ; then
1743 1743 echo "CURSES_LIBS=-lncurses" >> $config_mak
1744 1744 else
... ... @@ -1761,17 +1761,17 @@ if test &quot;$inotify&quot; = &quot;yes&quot; ; then
1761 1761 echo "#define CONFIG_INOTIFY 1" >> $config_h
1762 1762 fi
1763 1763 if test "$curl" = "yes" ; then
1764   - echo "CONFIG_CURL=yes" >> $config_mak
  1764 + echo "CONFIG_CURL=y" >> $config_mak
1765 1765 echo "CURL_LIBS=$curl_libs" >> $config_mak
1766 1766 echo "#define CONFIG_CURL 1" >> $config_h
1767 1767 fi
1768 1768 if test "$brlapi" = "yes" ; then
1769   - echo "CONFIG_BRLAPI=yes" >> $config_mak
  1769 + echo "CONFIG_BRLAPI=y" >> $config_mak
1770 1770 echo "#define CONFIG_BRLAPI 1" >> $config_h
1771 1771 echo "BRLAPI_LIBS=-lbrlapi" >> $config_mak
1772 1772 fi
1773 1773 if test "$bluez" = "yes" ; then
1774   - echo "CONFIG_BLUEZ=yes" >> $config_mak
  1774 + echo "CONFIG_BLUEZ=y" >> $config_mak
1775 1775 echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_mak
1776 1776 echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_mak
1777 1777 echo "#define CONFIG_BLUEZ 1" >> $config_h
... ... @@ -1781,10 +1781,10 @@ if test &quot;$xen&quot; = &quot;yes&quot; ; then
1781 1781 fi
1782 1782 if test "$aio" = "yes" ; then
1783 1783 echo "#define CONFIG_AIO 1" >> $config_h
1784   - echo "CONFIG_AIO=yes" >> $config_mak
  1784 + echo "CONFIG_AIO=y" >> $config_mak
1785 1785 fi
1786 1786 if test "$io_thread" = "yes" ; then
1787   - echo "CONFIG_IOTHREAD=yes" >> $config_mak
  1787 + echo "CONFIG_IOTHREAD=y" >> $config_mak
1788 1788 echo "#define CONFIG_IOTHREAD 1" >> $config_h
1789 1789 fi
1790 1790 if test "$blobs" = "yes" ; then
... ... @@ -1856,7 +1856,7 @@ fi
1856 1856  
1857 1857 if test "$xen" = "yes" ;
1858 1858 then
1859   - echo "CONFIG_XEN=yes" >> $config_mak
  1859 + echo "CONFIG_XEN=y" >> $config_mak
1860 1860 fi
1861 1861  
1862 1862 tools=
... ... @@ -1983,17 +1983,17 @@ case &quot;$target_cpu&quot; in
1983 1983 echo "#define TARGET_I386 1" >> $config_h
1984 1984 if test $kqemu = "yes" -a "$target_softmmu" = "yes"
1985 1985 then
1986   - echo "CONFIG_KQEMU=yes" >> $config_mak
  1986 + echo "CONFIG_KQEMU=y" >> $config_mak
1987 1987 echo "#define CONFIG_KQEMU 1" >> $config_h
1988 1988 fi
1989 1989 if test "$target_kvm" = "yes" ; then
1990   - echo "CONFIG_KVM=yes" >> $config_mak
  1990 + echo "CONFIG_KVM=y" >> $config_mak
1991 1991 echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
1992 1992 echo "#define CONFIG_KVM 1" >> $config_h
1993 1993 fi
1994 1994 if test "$xen" = "yes" -a "$target_softmmu" = "yes";
1995 1995 then
1996   - echo "CONFIG_XEN=yes" >> $config_mak
  1996 + echo "CONFIG_XEN=y" >> $config_mak
1997 1997 echo "#define CONFIG_XEN 1" >> $config_h
1998 1998 fi
1999 1999 target_phys_bits=32
... ... @@ -2005,17 +2005,17 @@ case &quot;$target_cpu&quot; in
2005 2005 echo "#define TARGET_X86_64 1" >> $config_h
2006 2006 if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64"
2007 2007 then
2008   - echo "CONFIG_KQEMU=yes" >> $config_mak
  2008 + echo "CONFIG_KQEMU=y" >> $config_mak
2009 2009 echo "#define CONFIG_KQEMU 1" >> $config_h
2010 2010 fi
2011 2011 if test "$target_kvm" = "yes" ; then
2012   - echo "CONFIG_KVM=yes" >> $config_mak
  2012 + echo "CONFIG_KVM=y" >> $config_mak
2013 2013 echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
2014 2014 echo "#define CONFIG_KVM 1" >> $config_h
2015 2015 fi
2016 2016 if test "$xen" = "yes" -a "$target_softmmu" = "yes"
2017 2017 then
2018   - echo "CONFIG_XEN=yes" >> $config_mak
  2018 + echo "CONFIG_XEN=y" >> $config_mak
2019 2019 echo "#define CONFIG_XEN 1" >> $config_h
2020 2020 fi
2021 2021 target_phys_bits=64
... ... @@ -2094,7 +2094,7 @@ case &quot;$target_cpu&quot; in
2094 2094 echo "#define TARGET_PPC 1" >> $config_h
2095 2095 echo "#define TARGET_PPCEMB 1" >> $config_h
2096 2096 if test "$target_kvm" = "yes" ; then
2097   - echo "CONFIG_KVM=yes" >> $config_mak
  2097 + echo "CONFIG_KVM=y" >> $config_mak
2098 2098 echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
2099 2099 echo "#define CONFIG_KVM 1" >> $config_h
2100 2100 fi
... ... @@ -2169,19 +2169,19 @@ if test &quot;$target_bigendian&quot; = &quot;yes&quot; ; then
2169 2169 echo "#define TARGET_WORDS_BIGENDIAN 1" >> $config_h
2170 2170 fi
2171 2171 if test "$target_softmmu" = "yes" ; then
2172   - echo "CONFIG_SOFTMMU=yes" >> $config_mak
  2172 + echo "CONFIG_SOFTMMU=y" >> $config_mak
2173 2173 echo "#define CONFIG_SOFTMMU 1" >> $config_h
2174 2174 fi
2175 2175 if test "$target_user_only" = "yes" ; then
2176   - echo "CONFIG_USER_ONLY=yes" >> $config_mak
  2176 + echo "CONFIG_USER_ONLY=y" >> $config_mak
2177 2177 echo "#define CONFIG_USER_ONLY 1" >> $config_h
2178 2178 fi
2179 2179 if test "$target_linux_user" = "yes" ; then
2180   - echo "CONFIG_LINUX_USER=yes" >> $config_mak
  2180 + echo "CONFIG_LINUX_USER=y" >> $config_mak
2181 2181 echo "#define CONFIG_LINUX_USER 1" >> $config_h
2182 2182 fi
2183 2183 if test "$target_darwin_user" = "yes" ; then
2184   - echo "CONFIG_DARWIN_USER=yes" >> $config_mak
  2184 + echo "CONFIG_DARWIN_USER=y" >> $config_mak
2185 2185 echo "#define CONFIG_DARWIN_USER 1" >> $config_h
2186 2186 fi
2187 2187 list=""
... ... @@ -2209,11 +2209,11 @@ if test &quot;$target_cpu&quot; = &quot;arm&quot; \
2209 2209 -o "$target_cpu" = "sparc" \
2210 2210 -o "$target_cpu" = "sparc64" \
2211 2211 -o "$target_cpu" = "sparc32plus"; then
2212   - echo "CONFIG_SOFTFLOAT=yes" >> $config_mak
  2212 + echo "CONFIG_SOFTFLOAT=y" >> $config_mak
2213 2213 echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
2214 2214 fi
2215 2215 if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
2216   - echo "TARGET_HAS_BFLT=yes" >> $config_mak
  2216 + echo "TARGET_HAS_BFLT=y" >> $config_mak
2217 2217 echo "#define TARGET_HAS_BFLT 1" >> $config_h
2218 2218 fi
2219 2219 if test "$target_user_only" = "yes" \
... ... @@ -2222,11 +2222,11 @@ if test &quot;$target_user_only&quot; = &quot;yes&quot; \
2222 2222 fi
2223 2223 # 32 bit ELF loader in addition to native 64 bit loader?
2224 2224 if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then
2225   - echo "TARGET_HAS_ELFLOAD32=yes" >> $config_mak
  2225 + echo "TARGET_HAS_ELFLOAD32=y" >> $config_mak
2226 2226 echo "#define TARGET_HAS_ELFLOAD32 1" >> $config_h
2227 2227 fi
2228 2228 if test "$target_bsd_user" = "yes" ; then
2229   - echo "CONFIG_BSD_USER=yes" >> $config_mak
  2229 + echo "CONFIG_BSD_USER=y" >> $config_mak
2230 2230 echo "#define CONFIG_BSD_USER 1" >> $config_h
2231 2231 fi
2232 2232  
... ...