diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 10:08:14 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 16:09:20 +0200 |
| commit | 92979a4e860f7e52f82292469e10b411ebaca0ae (patch) | |
| tree | 6039a3f90b3c3018a220a5adda01e8cc7a646738 | |
| parent | f4c80a78ce0e5648334fc43e5c93a068ed3ec5be (diff) | |
| download | nx-libs-92979a4e860f7e52f82292469e10b411ebaca0ae.tar.gz nx-libs-92979a4e860f7e52f82292469e10b411ebaca0ae.tar.bz2 nx-libs-92979a4e860f7e52f82292469e10b411ebaca0ae.zip | |
Makefile: Tell Xserver build which Xfont API to use (v2 or v1) depending on what's available in the build env.
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -19,6 +19,10 @@ USRLIBDIR ?= $(NXLIBDIR)/X11 INCLUDEDIR ?= $(PREFIX)/include CONFIGURE ?= ./configure +# use Xfont2 if available in the build env +FONT_DEFINES ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-DHAS_XFONT2") +XFONTLIB ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-lXfont2" || echo "-lXfont") + NX_VERSION_MAJOR=$(shell ./version.sh 1) NX_VERSION_MINOR=$(shell ./version.sh 2) NX_VERSION_MICRO=$(shell ./version.sh 3) @@ -75,7 +79,8 @@ build-full: cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE} ./mesa-quilt push -a - cd nx-X11 && ${MAKE} World USRLIBDIR=$(USRLIBDIR) SHLIBDIR=$(SHLIBDIR) + + cd nx-X11 && ${MAKE} World USRLIBDIR=$(USRLIBDIR) SHLIBDIR=$(SHLIBDIR) FONT_DEFINES=$(FONT_DEFINES) XFONTLIB=$(XFONTLIB) cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} |