Instead of individually registering support for font files and font
servers, use the libXfont-provided register_fpe_functions() which will
do the right thing (as of 1.4.2) depending how libXfont was configured.
This should let xfs run against a libXfont configured with --disable-fc.
---
Makefile.am | 4 +---
difs/initfonts.c | 9 +--------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d07ce8a..b9917ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,10 +23,8 @@ SUBDIRS=config doc man
bin_PROGRAMS = xfs
-FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
-
AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" \
- $(FONT_FLAGS) -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
+ -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
AM_CFLAGS = $(CWARNFLAGS)
diff --git a/difs/initfonts.c b/difs/initfonts.c
index 1a3c7b4..3b2551a 100644
--- a/difs/initfonts.c
+++ b/difs/initfonts.c
@@ -64,12 +64,5 @@ InitFonts(void)
ResetFontPrivateIndex();
-#ifdef FONT_PCF
- FontFileRegisterFpeFunctions();
-
-#endif
-
-#ifdef FONT_FS
- fs_register_fpe_functions();
-#endif
+ register_fpe_functions();
}
--
2.0.0.rc0
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
