Mercurial > mxe-octave

diff src/xft.mk @ 4803:e2349691d6ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix fontconfig dependencies Only include fontconfig as a dependency if USE_SYSTEM_FONTCONFIG is no.
author John W. Eaton <jwe@octave.org>
date Fri, 17 Aug 2018 14:09:31 -0400
parents 58de4f56c797
children
line wrap: on
line diff
--- a/src/xft.mk	Fri Aug 17 13:46:22 2018 -0400
+++ b/src/xft.mk	Fri Aug 17 14:09:31 2018 -0400
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := libXft-$($(PKG)_VERSION)
 $(PKG)_FILE     := libXft-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.x.org/archive/individual/lib/$($(PKG)_FILE)
-$(PKG)_DEPS     := kbproto xrender fontconfig freetype
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := kbproto xrender $($(PKG)_FONTCONFIG) freetype
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   define $(PKG)_BUILD