Mercurial > mxe-octave
comparison src/qt.mk @ 4803:e2349691d6ae
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 | e8da760989bc |
children |
comparison
equal
deleted
inserted
replaced
4802:9d58f6f5eaf3 | 4803:e2349691d6ae |
---|---|
7 $(PKG)_CHECKSUM := 76aef40335c0701e5be7bb3a9101df5d22fe3666 | 7 $(PKG)_CHECKSUM := 76aef40335c0701e5be7bb3a9101df5d22fe3666 |
8 $(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION) | 8 $(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION) |
9 $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz | 9 $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz |
10 $(PKG)_URL := http://download.qt.io/official_releases/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE) | 10 $(PKG)_URL := http://download.qt.io/official_releases/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE) |
11 $(PKG)_DEPS := postgresql freetds zlib libpng jpeg libmng tiff sqlite dbus | 11 $(PKG)_DEPS := postgresql freetds zlib libpng jpeg libmng tiff sqlite dbus |
12 ifeq ($(USE_SYSTEM_FONTCONFIG),no) | |
13 $(PKG)_FONTCONFIG := fontconfig | |
14 endif | |
15 ifeq ($(MXE_WINDOWS_BUILD),no) | 12 ifeq ($(MXE_WINDOWS_BUILD),no) |
16 ifeq ($(USE_SYSTEM_X11_LIBS),no) | 13 ifeq ($(USE_SYSTEM_X11_LIBS),no) |
17 $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm | 14 $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm |
18 endif | 15 endif |
19 endif | 16 endif |