diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 20:53:34 +0000 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 23:41:49 +0200 |
commit | d63b4a5bafaabcb456f70aacda2c348d049d8ee8 (patch) | |
tree | bd2fecf9cbdaaab05ac4453b675737e0b54c4e3d /nx-X11/config/cf/Server.tmpl | |
parent | 2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3 (diff) | |
download | nx-libs-d63b4a5bafaabcb456f70aacda2c348d049d8ee8.tar.gz nx-libs-d63b4a5bafaabcb456f70aacda2c348d049d8ee8.tar.bz2 nx-libs-d63b4a5bafaabcb456f70aacda2c348d049d8ee8.zip |
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.
Diffstat (limited to 'nx-X11/config/cf/Server.tmpl')
-rw-r--r-- | nx-X11/config/cf/Server.tmpl | 8 |
1 files changed, 0 insertions, 8 deletions
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 |