From fe011b55df68b7419a8042db94fc3fd1bcaca497 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Sat, 16 Dec 2017 03:55:58 +0100
Subject: Support building with legacy (pre-1.4.2) libXfont(1) versions.

Partly reverts ec30a857eb0d67b232f8d43e63a6370023f4c4d0, but in a
forward-compatible manner.

Legacy libXfont1 versions are automatically detected by the main
Makefile.
---
 nx-X11/programs/Xserver/dix/dixfonts.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'nx-X11/programs/Xserver/dix')

diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c
index 98d2a6439..0d90cd7b0 100644
--- a/nx-X11/programs/Xserver/dix/dixfonts.c
+++ b/nx-X11/programs/Xserver/dix/dixfonts.c
@@ -2139,7 +2139,13 @@ InitFonts ()
 
     ResetFontPrivateIndex();
 
+#ifdef LEGACY_XFONT1
+    BuiltinRegisterFpeFunctions();
+    FontFileRegisterFpeFunctions();
+    fs_register_fpe_functions();
+#else
     register_fpe_functions();
+#endif
 }
 #endif /* HAS_XFONT2 */
 
-- 
cgit v1.2.3