aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf/Server.tmpl
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-09 14:05:57 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-10 16:09:20 +0200
commitf4c80a78ce0e5648334fc43e5c93a068ed3ec5be (patch)
tree109fac35d5025730fc3bbce7b135118b233878e5 /nx-X11/config/cf/Server.tmpl
parentf743f9f743362c891f049a514cdcf3d39546194b (diff)
downloadnx-libs-f4c80a78ce0e5648334fc43e5c93a068ed3ec5be.tar.gz
nx-libs-f4c80a78ce0e5648334fc43e5c93a068ed3ec5be.tar.bz2
nx-libs-f4c80a78ce0e5648334fc43e5c93a068ed3ec5be.zip
Xserver: Support building against libXfont2 (v2) API and old libXfont(1) API alike.
Fixes ArcticaProject/nx-libs#296. Inspired by the following X.org commit. Other than X.org, we will continue support for building nx-libs against libXfont1 for a while. commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7 Author: Keith Packard <keithp@keithp.com> Date: Tue Sep 1 18:50:55 2015 -0700 dix: Switch to the libXfont2 API (v2) This new libXfont API eliminates exposing internal X server symbols to the font library, replacing those with a struct full of the entire API needed to use that library. v2: Use libXfont2 instead of libXfont_2 Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'nx-X11/config/cf/Server.tmpl')
-rw-r--r--nx-X11/config/cf/Server.tmpl8
1 files changed, 8 insertions, 0 deletions
diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl
index ffdca6811..bae6f3b02 100644
--- a/nx-X11/config/cf/Server.tmpl
+++ b/nx-X11/config/cf/Server.tmpl
@@ -70,3 +70,11 @@ GLX_DEFINES = GlxDefines
#ifdef XorgVersion
#include <xorg.tmpl>
#endif
+
+#if HasXfont2
+FONT_DEFINES = -DHAS_XFONT2
+ XFONTLIB = -lXfont2
+#else
+FONT_DEFINES =
+ XFONTLIB = -lXfont
+#endif