Attachment 17378 Details for Bug 16522 – Add configure option "--disable-fc", which disables font server support

[patch] Add configure option "--disable-fc", which disables font server support

xorg-server-1.4.2-fc_disable.diff (text/plain), 2.00 KB, created by Maarten ter Huurne on 2008-06-25 11:15:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maarten ter Huurne

Created: 2008-06-25 11:15:56 UTC

Size: 2.00 KB

patch

obsolete

>diff -ur xorg-server-1.4.2.org/configure.ac xorg-server-1.4.2/configure.ac
>--- xorg-server-1.4.2.org/configure.ac	2008-06-11 16:26:34.000000000 +0200
>+++ xorg-server-1.4.2/configure.ac	2008-06-25 19:38:19.000000000 +0200
>@@ -471,6 +471,9 @@
> AC_ARG_ENABLE(builtin-fonts,  AS_HELP_STRING([--enable-builtin-fonts], [Use only built-in fonts (default: use external)]),
>                                 [BUILTIN_FONTS=$enableval],
>                                 [BUILTIN_FONTS=no])
>+AC_ARG_ENABLE(fc, AS_HELP_STRING([--disable-fc ],[Support use of a font server (default: auto)]),
>+                                [XFONT_FC=$enableval],
>+                                [XFONT_FC=auto])
> 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])
>@@ -860,9 +863,16 @@
> fi
> 
> if test "x$BUILTIN_FONTS" = xyes; then
>-       AC_DEFINE(BUILTIN_FONTS, 1, [Use only built-in fonts])
>-       AC_DEFINE(NOFONTSERVERACCESS, 1, [Avoid using a font server])
>-       FONTPATH="built-ins"
>+	AC_DEFINE(BUILTIN_FONTS, 1, [Use only built-in fonts])
>+	FONTPATH="built-ins"
>+	if test "x$XFONT_FC" = xyes || test "x$XFONT_FC" = xauto; then
>+		AC_MSG_NOTICE([Disabling font server support])
>+		XFONT_FC=no
>+	fi
>+fi
>+
>+if test "x$XFONT_FC" = xno; then
>+	AC_DEFINE(NOFONTSERVERACCESS, 1, [Avoid using a font server])
> fi
> 
> if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
>diff -ur xorg-server-1.4.2.org/dix/dixfonts.c xorg-server-1.4.2/dix/dixfonts.c
>--- xorg-server-1.4.2.org/dix/dixfonts.c	2008-06-10 19:57:18.000000000 +0200
>+++ xorg-server-1.4.2/dix/dixfonts.c	2008-06-25 18:57:51.000000000 +0200
>@@ -1893,7 +1893,9 @@
>     if (screenInfo.numScreens > screenInfo.numVideoScreens) {
> 	PrinterFontRegisterFpeFunctions();
> 	FontFileCheckRegisterFpeFunctions();
>+#ifndef NOFONTSERVERACCESS
> 	check_fs_register_fpe_functions();
>+#endif
>     } else 
> #endif
>     {

Actions: View | Splinter Review

Attachments on bug 16522: 17378

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.