summaryrefslogtreecommitdiffstats
path: root/scilab/configure.ac
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-03-13 11:52:47 +0100
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-03-13 11:52:47 +0100
commit4e5fde2de1520cdec08c99cc99b2a3ddd955c2c1 (patch)
tree908a3ba1aa168124432ee31cd2ded517d7f4bdfc /scilab/configure.ac
parente9516e982420029d6a5a0080cf35793ff4fa68ff (diff)
parenta337d144271aa0fc3737071de9dfea3c8fbcc8dc (diff)
downloadscilab-4e5fde2de1520cdec08c99cc99b2a3ddd955c2c1.zip
scilab-4e5fde2de1520cdec08c99cc99b2a3ddd955c2c1.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/configure scilab/modules/graphic_objects/Makefile.am scilab/modules/graphic_objects/Makefile.in scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectData.java scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectDataJNI.java scilab/modules/graphics/src/c/getHandleProperty/get_triangles_property.c scilab/modules/statistics/macros/st_deviation.sci scilab/modules/xml/src/cpp/VariableScope.cpp scilab/modules/xml/src/cpp/VariableScope.hxx scilab/modules/xml/src/cpp/XMLDocument.cpp Change-Id: Ic4c2565536094b03e3bbd6b14bf6954e57fe1576
Diffstat (limited to 'scilab/configure.ac')
-rw-r--r--scilab/configure.ac2
1 files changed, 2 insertions, 0 deletions
diff --git a/scilab/configure.ac b/scilab/configure.ac
index c0681cc..f402f07 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -953,6 +953,8 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
953 JOGL2=$PACKAGE_JAR_FILE 953 JOGL2=$PACKAGE_JAR_FILE
954 AC_SUBST(JOGL2) 954 AC_SUBST(JOGL2)
955 955
956 AC_JAVA_CHECK_VERSION_MANIFEST([jogl2],$JOGL2,[2.2],[Specification-Version])
957
956 if test "$MACOSX" = 1; then 958 if test "$MACOSX" = 1; then
957 echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X" 959 echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X"
958 else 960 else