comparison src/stable-octave.mk @ 3827:02990526ae69

allow building of X11 libs to be disabled
author John W. Eaton <jwe@octave.org>
date Wed, 04 Mar 2015 09:27:23 -0500
parents c6dd0518f31b
children e50c777c9a97
comparison
equal deleted inserted replaced
3826:58d4bbcb30bc 3827:02990526ae69
11 ifeq ($(USE_SYSTEM_FONTCONFIG),no) 11 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
12 $(PKG)_FONTCONFIG := fontconfig 12 $(PKG)_FONTCONFIG := fontconfig
13 endif 13 endif
14 $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack osmesa pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib 14 $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack osmesa pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
15 ifeq ($(MXE_WINDOWS_BUILD),no) 15 ifeq ($(MXE_WINDOWS_BUILD),no)
16 $(PKG)_DEPS += x11 xext 16 ifeq ($(USE_SYSTEM_X11_LIBS),no)
17 $(PKG)_DEPS += x11 xext
18 endif
17 endif 19 endif
18 ifeq ($(ENABLE_64),no) 20 ifeq ($(ENABLE_64),no)
19 $(PKG)_DEPS += qhull 21 $(PKG)_DEPS += qhull
20 endif 22 endif
21 ifeq ($(ENABLE_JIT),yes) 23 ifeq ($(ENABLE_JIT),yes)