xprint: Changes to 'upstream-unstable'

[Drew Parsons <dparsons@alioth.debian.org>]

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

New commits:
commit f7b940677eae414ab08ce41fe6bdb7253b7a7864
Author: Drew Parsons <dparsons@debian.org>
Date:   Sun Oct 18 14:18:15 2009 +1100

    By default, enable built-in fonts in configure script.
    
    BUILTIN_FONTS, used by dix/dixfonts.c, is now defined by default via
    the builtin-fonts variable in the configure scripts. It may be
    disabled by using ./configure --disable-builtin-fonts.
    
    This has been done since Xprint support was removed from libXfont 1.4.
    
    If built-in fonts are disabled then PrinterFontRegisterFpeFunctions,
    FontFileCheckRegisterFpeFunctions and check_fs_register_fpe_functions
    will not be defined in dix/dixfonts.c, when libXfont 1.4 is used (they
    were previously defined by libXfont 1.3). Hence, assume built-in fonts
    are used by default.
    (see also commit 6f47f7c0585c2b621c39cae9eef2a04d7f81bcc0 ).

diff --git a/configure.ac b/configure.ac
index 48ca285..a58c303 100644
--- a/configure.ac
+++ b/configure.ac
@@ -504,9 +504,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: use built-in fonts)]),
                                 [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])