From fe011b55df68b7419a8042db94fc3fd1bcaca497 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan 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. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cfd0d10b8..b0beacd23 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ INCLUDEDIR ?= $(PREFIX)/include CONFIGURE ?= ./configure --prefix=$(PREFIX) # use Xfont2 if available in the build env -FONT_DEFINES ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-DHAS_XFONT2") +FONT_DEFINES ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-DHAS_XFONT2") $(shell pkg-config --exists 'xfont < 1.4.2' 1>/dev/null 2>/dev/null && echo "-DLEGACY_XFONT1") XFONTLIB ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-lXfont2" || echo "-lXfont") NX_VERSION_MAJOR=$(shell ./version.sh 1) -- cgit v1.2.3