Mercurial > mxe-octave
comparison src/qt.mk @ 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 | bb70aeee012e |
children | 4e204ea06bc8 |
comparison
equal
deleted
inserted
replaced
3829:2a48f5ac37e1 | 3830:c2abfa00fca5 |
---|---|
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-project.org/archives/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE) | 10 $(PKG)_URL := http://download.qt-project.org/archives/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE) |
11 $(PKG)_DEPS := postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus fontconfig | 11 $(PKG)_DEPS := postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus fontconfig |
12 ifeq ($(MXE_WINDOWS_BUILD),no) | 12 ifeq ($(MXE_WINDOWS_BUILD),no) |
13 $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm | 13 ifeq ($(USE_SYSTEM_X11_LIBS),no) |
14 $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm | |
15 endif | |
14 endif | 16 endif |
15 | 17 |
16 $(PKG)_CONFIGURE_CMD := | 18 $(PKG)_CONFIGURE_CMD := |
17 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := | 19 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := |
18 $(PKG)_CONFIGURE_DATABASE_OPTION := | 20 $(PKG)_CONFIGURE_DATABASE_OPTION := |