Mercurial > mxe-octave
changeset 3830:c2abfa00fca5
qt.mk, gl2ps.mk: make X11 dependencies optional
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 04 Mar 2015 10:40:22 -0500 |
parents | 2a48f5ac37e1 |
children | 1191cff7f132 |
files | src/gl2ps.mk src/qt.mk |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gl2ps.mk Wed Mar 04 09:32:38 2015 -0500 +++ b/src/gl2ps.mk Wed Mar 04 10:40:22 2015 -0500 @@ -7,8 +7,11 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-source $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz $(PKG)_URL := http://geuz.org/$(PKG)/src/$($(PKG)_FILE) -$(PKG)_DEPS := xft +$(PKG)_DEPS := +ifeq ($(USE_SYSTEM_X11_LIBS),no) + $(PKG)_DEPS += xft +endif ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) ifeq ($(MXE_SYSTEM),msvc)
--- a/src/qt.mk Wed Mar 04 09:32:38 2015 -0500 +++ b/src/qt.mk Wed Mar 04 10:40:22 2015 -0500 @@ -10,7 +10,9 @@ $(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 ifeq ($(MXE_WINDOWS_BUILD),no) - $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm + ifeq ($(USE_SYSTEM_X11_LIBS),no) + $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm + endif endif $(PKG)_CONFIGURE_CMD :=