From d63b4a5bafaabcb456f70aacda2c348d049d8ee8 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 10 Apr 2017 20:53:34 +0000
Subject: Regression fix for added libXfont2 API support:

 - Move FONT_DEFINES and XLIBFONT definition to from Server.tmpl to
   Imake.tmpl.
 - Add FONT_DEFINES to ALLDEFINES.
 - Drop SpecialCObjectRules with FONT_DEFINES from various Imakefiles
   again, FONT_DEFINES is now set "globally".
 - Hand over FONT_DEFINES from main Makefile to nx-X11's make BuildEnv
   to make gccmakedep happy.
---
 nx-X11/config/cf/Imake.tmpl  | 11 ++++++++++-
 nx-X11/config/cf/Server.tmpl |  8 --------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'nx-X11/config/cf')

diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 9ca1f16d7..9deeb302d 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -1878,6 +1878,15 @@ SETITIMER_DEFINES = HasSetitimerDefines
      POSTNOSTDLIB =
 #endif
 #endif
+
+#if HasXfont2
+FONT_DEFINES = -DHAS_XFONT2
+    XFONTLIB = -lXfont2
+#else
+FONT_DEFINES =
+    XFONTLIB = -lXfont
+#endif
+
 /*
  * Here we set up flags needed to produce position-independent code
  * when doing C and C++ compilation.  The default if you specify C
@@ -1976,7 +1985,7 @@ SETITIMER_DEFINES = HasSetitimerDefines
  * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
  */
       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(SETITIMER_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(SETITIMER_DEFINES) $(FONT_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
            CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
          LDPRELIB = LdPreLib $(INSTALLED_LIBS)
diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl
index bae6f3b02..ffdca6811 100644
--- a/nx-X11/config/cf/Server.tmpl
+++ b/nx-X11/config/cf/Server.tmpl
@@ -70,11 +70,3 @@ GLX_DEFINES = GlxDefines
 #ifdef XorgVersion
 #include <xorg.tmpl>
 #endif
-
-#if HasXfont2
-FONT_DEFINES = -DHAS_XFONT2
-    XFONTLIB = -lXfont2
-#else
-FONT_DEFINES =
-    XFONTLIB = -lXfont
-#endif
-- 
cgit v1.2.3