Mercurial > mxe-octave
changeset 3208:1080856f48c4
new configure option: --enable-system-fontconfig
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 06 Aug 2013 13:56:48 -0400 |
| parents | 21a6b1257dd8 |
| children | 360f71254066 |
| files | Makefile.in configure.ac src/octave.mk |
| diffstat | 3 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Tue Aug 06 13:40:49 2013 -0400 +++ b/Makefile.in Tue Aug 06 13:56:48 2013 -0400 @@ -14,11 +14,13 @@ MXE_NATIVE_BUILD := @MXE_NATIVE_BUILD@ # Set to "yes" to use the versions of GCC and binutils already -# installed on your system. NOTE: building a copy of GCC for a -# native build does not appear to work correctly yet, so for now you -# must set USE_SYSTEM_GCC to yes if MXE_NATIVE_BUILD is set to yes. +# installed on your system (default is yes if doing native build). USE_SYSTEM_GCC := @USE_SYSTEM_GCC@ +# Set to "yes" to use the version of fontconfig already installed +# on your system (default is yes if doing native build). +USE_SYSTEM_FONTCONFIG := @USE_SYSTEM_FONTCONFIG@ + # Should match what config.guess prints for your system. # If cross compiling, you must set it manually. ifeq ($(MXE_NATIVE_BUILD),yes)
--- a/configure.ac Tue Aug 06 13:40:49 2013 -0400 +++ b/configure.ac Tue Aug 06 13:56:48 2013 -0400 @@ -87,11 +87,18 @@ [if test "$enableval" = yes; then MXE_NATIVE_BUILD=yes; fi], []) AC_SUBST(MXE_NATIVE_BUILD) +USE_SYSTEM_FONTCONFIG=$MXE_NATIVE_BUILD +AC_ARG_ENABLE([system-fontconfig], + [AS_HELP_STRING([--enable-system-fontconfig], + [Use fontconfig already installed on system])], + [if test "$enableval" = yes; then USE_SYSTEM_FONTCONFIG=yes; else USE_SYSTEM_FONTCONFIG=no; fi], []) +AC_SUBST(USE_SYSTEM_FONTCONFIG) + USE_SYSTEM_GCC=$MXE_NATIVE_BUILD AC_ARG_ENABLE([system-gcc], [AS_HELP_STRING([--enable-system-gcc], [Use GCC already installed on system])], - [if test "$enableval" = yes; then USE_SYSTEM_GCC=yes; fi], []) + [if test "$enableval" = yes; then USE_SYSTEM_GCC=yes; else USE_SYSTEM_GCC=no; fi], []) AC_SUBST(USE_SYSTEM_GCC) USE_PIC_FLAG=no
--- 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