diff options
| author | Julien Cristau <jcristau@debian.org> | 2014-05-08 19:28:27 +0200 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-05-20 21:44:30 -0700 |
| commit | 62daf761ea5e7c810d305c84426a8769db785979 (patch) | |
| tree | 8f27d31bc4779218c66b1d5b3f75d2d33272202a | |
| parent | c6bb161dcb391977d353dc1c9d2b7d10179a20d4 (diff) | |
Use the register_fpe_functions() function from libXfont
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.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | 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(); } |