Mercurial > mxe-octave

changeset 3865:4e204ea06bc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt.mk: only depend on fontconfig if $(USE_SYSTEM_FONTCONFIG) is set to "no"
author John W. Eaton <jwe@octave.org>
date Thu, 26 Mar 2015 09:05:37 -0400
parents 3feb4f13794f
children d368a2fb7cf0
files src/qt.mk
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt.mk	Tue Mar 24 16:54:54 2015 -0400
+++ b/src/qt.mk	Thu Mar 26 09:05:37 2015 -0400
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.qt-project.org/archives/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus fontconfig
+$(PKG)_DEPS     := postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
 ifeq ($(MXE_WINDOWS_BUILD),no)
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
     $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm