Mercurial > mxe-octave

changeset 3333:4372645ff7e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add --disable-java option to configure. * Makefile.in: Add ENABLE_JAVA Makefile variable that is substituted by configure. * configure.ac: Add AC_ARG_ENABLE macro call with ENABLE_JAVA defaulted to yes. * src/octave.mk: Call Octave configure script with --disable-java if MXE option has been specified.
author Rik <rik@octave.org>
date Sat, 23 Nov 2013 09:10:20 -0800
parents bcd49640ed0f
children 324937497c32
files Makefile.in configure.ac src/octave.mk
diffstat 3 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Sat Nov 23 09:05:40 2013 -0800
+++ b/Makefile.in	Sat Nov 23 09:10:20 2013 -0800
@@ -41,6 +41,9 @@
 # enabled (experimental; requires 64-bit system and compiler).
 ENABLE_64 := @ENABLE_64@
 
+# Attempt to build with support for Java.
+ENABLE_JAVA := @ENABLE_JAVA@
+
 # Attempt to build LLVM and enable Octave's experimental JIT compiler.
 ENABLE_JIT := @ENABLE_JIT@
 
--- a/configure.ac	Sat Nov 23 09:05:40 2013 -0800
+++ b/configure.ac	Sat Nov 23 09:10:20 2013 -0800
@@ -80,6 +80,12 @@
   [if test "$enableval" = no; then ENABLE_JIT=no; fi], [])
 AC_SUBST(ENABLE_JIT)
 
+ENABLE_JAVA=yes
+AC_ARG_ENABLE([java],
+  [AS_HELP_STRING([--disable-java], [Disable Java])],
+  [if test "$enableval" = no; then ENABLE_JAVA=no; fi], [])
+AC_SUBST(ENABLE_JAVA)
+
 MXE_NATIVE_BUILD=no
 AC_ARG_ENABLE([native-build],
   [AS_HELP_STRING([--enable-native-build],
--- a/src/octave.mk	Sat Nov 23 09:05:40 2013 -0800
+++ b/src/octave.mk	Sat Nov 23 09:10:20 2013 -0800
@@ -13,9 +13,13 @@
 $(PKG)_DEPS     := arpack curl fftw fltk $($(PKG)_FONTCONFIG) gl2ps 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
+  $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
 else
-$(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit
+   Remove $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit
+endif
+
+ifeq ($(ENABLE_JAVA),no)
+  $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := --disable-java
 endif
 
 ifeq ($(ENABLE_OPENBLAS),yes)
@@ -76,6 +80,7 @@
         $($(PKG)_BLAS_OPTION) \
         $($(PKG)_CROSS_CONFIG_OPTIONS) \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
+        $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
         $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' \