Mercurial > mxe-octave

diff src/octave.mk @ 3208:1080856f48c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new configure option: --enable-system-fontconfig
author John W. Eaton <jwe@octave.org>
date Tue, 06 Aug 2013 13:56:48 -0400
parents d1231b6c2b34
children 94339f5a27fe
line wrap: on
line diff
--- a/src/octave.mk	Tue Aug 06 13:40:49 2013 -0400
+++ b/src/octave.mk	Tue Aug 06 13:56:48 2013 -0400
@@ -7,7 +7,10 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack curl fftw fltk fontconfig glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := arpack curl fftw fltk $($(PKG)_FONTCONFIG) glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(ENABLE_JIT),yes)
   $(PKG)_DEPS += llvm
 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit