From f4c80a78ce0e5648334fc43e5c93a068ed3ec5be Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 9 Feb 2017 14:05:57 +0100 Subject: 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 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 Reviewed-by: Adam Jackson --- nx-X11/programs/Xserver/Imakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Imakefile') diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 801df5edc..e5dfa9320 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -323,7 +323,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \ -lXcompshad \ -lXrender \ -lXfixes \ - -lXfont \ + $(XFONTLIB) \ -lXcomposite \ -lXinerama \ -lXdmcp \ @@ -338,7 +338,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \ -lXcompshad \ -lXrender \ -lXfixes \ - -lXfont \ + $(XFONTLIB) \ -lXcomposite \ -lXdmcp \ -lNX_X11 \ @@ -353,7 +353,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \ -lXcompshad \ -lXrender \ -lXfixes \ - -lXfont \ + $(XFONTLIB) \ -lXcomposite \ -lXinerama \ -lXdmcp \ @@ -368,7 +368,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \ -lXcompshad \ -lXrender \ -lXfixes \ - -lXfont \ + $(XFONTLIB) \ -lXcomposite \ -lXinerama \ -lXdmcp \ -- cgit v1.2.3