summaryrefslogtreecommitdiffstats
path: root/scilab/configure.ac
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-05-13 10:50:16 +0200
committerClément DAVID <clement.david@scilab.org>2011-05-13 10:50:16 +0200
commit243216a8d0fd685d4af1fda457ede653b9a87a5b (patch)
tree8eb2cef50bbe25ab53329475a56d6e485c7174c2 /scilab/configure.ac
parent5e115d215049c518d4e687e5f74683ed6e59879f (diff)
parenta5cbed5a0f7b8ea6ceed174cc6707a3ce4d655db (diff)
downloadscilab-simulinkimport.zip
scilab-simulinkimport.tar.gz
Merge commit '5.3.2' into simulinkimportsimulinkimport
Change-Id: I61d0f569b84671ab0be452d8ae7ca9a9fd5595ff
Diffstat (limited to 'scilab/configure.ac')
-rw-r--r--scilab/configure.ac29
1 files changed, 25 insertions, 4 deletions
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 031f8d3..c4ad3e2 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1,7 +1,7 @@
1# 1#
2# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru 3# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
4# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru 4# Copyright (C) DIGITEO - 2009-2011 - Sylvestre Ledru
5# Copyright (C) DIGITEO - 2009 - Pierre MARECHAL <pierre.marechal@scilab.org> 5# Copyright (C) DIGITEO - 2009 - Pierre MARECHAL <pierre.marechal@scilab.org>
6# 6#
7# This file must be used under the terms of the CeCILL. 7# This file must be used under the terms of the CeCILL.
@@ -765,6 +765,14 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
765 # by the above --with options 765 # by the above --with options
766 AC_JAVA_WITH_JDK 766 AC_JAVA_WITH_JDK
767 AC_JAVA_DETECT_JVM 767 AC_JAVA_DETECT_JVM
768 case "$ac_java_jvm_version" in
769 1.6 | 1.7)
770 ;;
771 *)
772 AC_MSG_ERROR([Wrong version of Java. Expected at least 1.6. Found $ac_java_jvm_version])
773 ;;
774 esac
775
768 if test "$ac_java_jvm_name" = "jdk"; then 776 if test "$ac_java_jvm_name" = "jdk"; then
769 JAVA_HOME=$ac_java_jvm_dir 777 JAVA_HOME=$ac_java_jvm_dir
770 JAVA_VERSION=$ac_java_jvm_version 778 JAVA_VERSION=$ac_java_jvm_version
@@ -772,9 +780,18 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
772 AC_JAVA_JNI_INCLUDE 780 AC_JAVA_JNI_INCLUDE
773 JAVA_JNI_INCLUDE=$ac_java_jvm_jni_include_flags 781 JAVA_JNI_INCLUDE=$ac_java_jvm_jni_include_flags
774 782
775 AC_JAVA_JNI_LIBS 783 case "$host_os" in
776 JAVA_JNI_LIBS=$ac_java_jvm_jni_lib_flags 784 *Darwin* | *darwin*)
777 JAVA_JNI_LIBS_PRELOAD=$ac_java_jvm_ld_preload 785 # Mac OS X does not link against the lib but uses -framework
786 JAVA_JNI_LIBS="-framework JavaVM"
787 ;;
788 *)
789 AC_JAVA_JNI_LIBS
790 JAVA_JNI_LIBS=$ac_java_jvm_jni_lib_flags
791 JAVA_JNI_LIBS_PRELOAD=$ac_java_jvm_ld_preload
792 ;;
793 esac
794
778 AC_JAVA_CLASSPATH 795 AC_JAVA_CLASSPATH
779 JAVA_CLASSPATH=$ac_java_classpath 796 JAVA_CLASSPATH=$ac_java_classpath
780 AC_JAVA_TOOLS 797 AC_JAVA_TOOLS
@@ -1128,6 +1145,9 @@ AC_CHECK_FUNCS([mkdir])
1128# Provided by mman.h 1145# Provided by mman.h
1129AC_CHECK_FUNCS([munmap]) 1146AC_CHECK_FUNCS([munmap])
1130 1147
1148# Provided by signal.h
1149AC_CHECK_FUNCS([strsignal])
1150
1131 1151
1132# Check of the libm (lib math). Macro provided by libtool. 1152# Check of the libm (lib math). Macro provided by libtool.
1133save_LDFLAGS="$LDFLAGS" 1153save_LDFLAGS="$LDFLAGS"
@@ -1644,6 +1664,7 @@ AM_CONDITIONAL(ENABLE_STATIC, test "$libtool_build_static_libs" = xxxx)
1644AC_C_CONST() 1664AC_C_CONST()
1645AC_C_INLINE() 1665AC_C_INLINE()
1646 1666
1667AC_BACKTRACE()
1647 1668
1648########## 1669##########
1649##### Code quality 1670##### Code quality