summaryrefslogtreecommitdiffstats
path: root/scilab/configure.ac
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-07-18 17:20:58 +0200
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-07-18 17:20:58 +0200
commit86427d492655e005c7b9cf98cf18cbe2ff863976 (patch)
tree067e3fc84dd04f40aac8b057dbf68abd33912ac1 /scilab/configure.ac
parent0f7e7dc855ce45c7b3dc6df12210049a66acf69b (diff)
parenta9b864d9103c582fa72d45c5f69a4dc04f74c975 (diff)
downloadscilab-86427d492655e005c7b9cf98cf18cbe2ff863976.zip
scilab-86427d492655e005c7b9cf98cf18cbe2ff863976.tar.gz
Merge remote-tracking branch 'origin/5.5'
Conflicts: scilab/modules/javasci/Makefile.in Change-Id: I4e8a6cbbe895fbe582a2de5bf048623cd2e38445
Diffstat (limited to 'scilab/configure.ac')
-rw-r--r--scilab/configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 5d72f2a..29ade25 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -806,7 +806,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
806 # by the above --with options 806 # by the above --with options
807 AC_JAVA_WITH_JDK 807 AC_JAVA_WITH_JDK
808 if test "$with_jdk" != no; then 808 if test "$with_jdk" != no; then
809 809
810 AC_JAVA_DETECT_JVM 810 AC_JAVA_DETECT_JVM
811 case "$ac_java_jvm_version" in 811 case "$ac_java_jvm_version" in
812 1.6 | 1.7 | 1.8) 812 1.6 | 1.7 | 1.8)
@@ -1996,6 +1996,8 @@ scilab-lib-doc.properties
1996modules/helptools/etc/SciDocConf.xml 1996modules/helptools/etc/SciDocConf.xml
1997modules/core/includes/version.h 1997modules/core/includes/version.h
1998modules/core/includes/stack.h 1998modules/core/includes/stack.h
1999modules/atoms/etc/repositories
2000modules/atoms/tests/unit_tests/repositories.orig
1999]) 2001])
2000 2002
2001# Detection of the module for the future version of Scilab 6 2003# Detection of the module for the future version of Scilab 6