# HG changeset patch # User John W. Eaton # Date 1427375137 14400 # Node ID 4e204ea06bc80dba00f65ab3e8af658483bb1d12 # Parent 3feb4f13794fde68af1a719cd97f40939049065e qt.mk: only depend on fontconfig if $(USE_SYSTEM_FONTCONFIG) is set to "no" diff -r 3feb4f13794f -r 4e204ea06bc8 src/qt.mk --- 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