diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-12-16 03:55:58 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-16 04:05:34 +0100 |
commit | fe011b55df68b7419a8042db94fc3fd1bcaca497 (patch) | |
tree | 4bc944eb7ee4b536f7a60f05c55d7302616eb243 /Makefile | |
parent | fb2e9a8b54b0e404d76fe93b969e47a8209d1532 (diff) | |
download | nx-libs-fe011b55df68b7419a8042db94fc3fd1bcaca497.tar.gz nx-libs-fe011b55df68b7419a8042db94fc3fd1bcaca497.tar.bz2 nx-libs-fe011b55df68b7419a8042db94fc3fd1bcaca497.zip |
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.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |