summaryrefslogtreecommitdiffstats
path: root/scilab/configure.ac
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-03-13 09:25:53 +0100
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-03-13 09:25:53 +0100
commita337d144271aa0fc3737071de9dfea3c8fbcc8dc (patch)
tree0295463a77411c9ca3b49a581eeece0409bf1298 /scilab/configure.ac
parenta9a9cd58c4b5c4a0b41f6afdd440c5f1751e4718 (diff)
parent814e090c1e336aae6a540ec6030c991af0c7b4d6 (diff)
downloadscilab-a337d144271aa0fc3737071de9dfea3c8fbcc8dc.zip
scilab-a337d144271aa0fc3737071de9dfea3c8fbcc8dc.tar.gz
Merge remote-tracking branch 'origin/5.5'
Conflicts: scilab/configure Change-Id: I8c3e51baa048eea94c27b427aa602bd97b7f73dc
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 de95c53..75c5c8f 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -915,6 +915,8 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
915 JOGL2=$PACKAGE_JAR_FILE 915 JOGL2=$PACKAGE_JAR_FILE
916 AC_SUBST(JOGL2) 916 AC_SUBST(JOGL2)
917 917
918 AC_JAVA_CHECK_VERSION_MANIFEST([jogl2],$JOGL2,[2.2],[Specification-Version])
919
918 if test "$MACOSX" = 1; then 920 if test "$MACOSX" = 1; then
919 echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X" 921 echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X"
920 else 922 else