xserver: Branch 'master'

[Tiago Vignatti]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 385943e0e97463ce4681a9b6a4a40d7e3c91e51e
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Tue Jun 24 23:13:32 2008 -0300

    Set --enable-builtin-fonts as default.
    
    Some reasons to embed fonts by default:
    1. X server doesn't pick a good default font path so it's easiest just
    to built in the core fonts and let new X hackers more happy. Developers
    and distro guys are wise enough to just set --disable-builtin-fonts
    when they want.
    
    2. Seems that this is by far the most popular FAQ
    (http://www.x.org/wiki/FAQErrorMessages).
    
    3. No one gave a good argument to not do this:
        http://lists.freedesktop.org/archives/xorg/2008-May/035479.html

diff --git a/configure.ac b/configure.ac
index ab6cb10..ce2721d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -505,9 +505,9 @@ AC_ARG_ENABLE(install-libxf86config,
 				[Install libxf86config (default: disabled)]),
 				[INSTALL_LIBXF86CONFIG=$enableval],
 				[INSTALL_LIBXF86CONFIG=no])
-AC_ARG_ENABLE(builtin-fonts,  AS_HELP_STRING([--enable-builtin-fonts], [Use only built-in fonts (default: use external)]),
+AC_ARG_ENABLE(builtin-fonts,  AS_HELP_STRING([--enable-builtin-fonts], [Use only built-in fonts (default: yes)]),
                                 [BUILTIN_FONTS=$enableval],
-                                [BUILTIN_FONTS=no])
+                                [BUILTIN_FONTS=yes])
 AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use an empty root cursor (default: use core cursor)]),
                                  [NULL_ROOT_CURSOR=$enableval],
                                  [NULL_ROOT_CURSOR=no])