diff options
| author | Daniel Stone <daniel.stone@nokia.com> | 2006-07-19 19:55:13 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 15:19:52 -0400 |
| commit | ecfad74c48f633916305bcc25baaaad74aa52b78 (patch) | |
| tree | 3516291da00962af37153bf108d2868ee2cb96ce /dix/dixfonts.c | |
| parent | 0a2068d123520d35818c38a555ae3ba06d8ca7fb (diff) | |
add support for built-in fonts
Use --enable-builtin-fonts to only use built-in fonts, and avoid loading
fonts.
Diffstat (limited to 'dix/dixfonts.c')
| -rw-r--r-- | dix/dixfonts.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c index cb0df3c30..ef23fa8d4 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1889,7 +1889,7 @@ InitFonts () { patternCache = MakeFontPatternCache(); -#ifndef KDRIVESERVER +#ifndef BUILTIN_FONTS if (screenInfo.numScreens > screenInfo.numVideoScreens) { PrinterFontRegisterFpeFunctions(); FontFileCheckRegisterFpeFunctions(); @@ -1897,10 +1897,11 @@ InitFonts () } else #endif { -#ifdef KDRIVESERVER - BuiltinRegisterFpeFunctions(); -#endif +#ifdef BUILTIN_FONTS + BuiltinRegisterFpeFunctions(); +#else FontFileRegisterFpeFunctions(); +#endif #ifndef NOFONTSERVERACCESS fs_register_fpe_functions(); #endif |