Merge remote branch 'origin/master' into MPI
[scilab.git] / scilab / configure.ac
index 9f55174..be45204 100644 (file)
@@ -664,7 +664,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
                                JGRAPHX=$PACKAGE_JAR_FILE
                                AC_SUBST(JGRAPHX)
 
-                               AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.0],[mxGraph.VERSION])
+                               AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.7],[mxGraph.VERSION])
 
                                # Docking system
                                AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui])
@@ -699,7 +699,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
                                   # Provide known paths where distribs/OS can store JNI libs
                                   LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
                                   AC_CHECK_LIB([jogl], [glTexParameterf], [JOGL_LIBS="-ljogl"],[AC_MSG_WARN([Could not link against -ljogl. Will try against -ljogl -lGL])])
-                                  if test -z "JOGL_LIBS"; then # The previous test failed add more options to the LDFLAGS
+                                  if test -z "$JOGL_LIBS"; then # The previous test failed add more options to the LDFLAGS
                                           LDFLAGS="$LDFLAGS -lGL "
                                           # the space after "jogl" in the following line is on 
                                           # purpose to disable the cache
@@ -1148,7 +1148,7 @@ AC_LIBXML2()
 ## Test for gettext
 #######################
 
-ALL_LINGUAS="en_US fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT"
+ALL_LINGUAS="en_US fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT uk_UA"
 
 AC_ARG_ENABLE(build-localization,
                AC_HELP_STRING([--disable-build-localization],[Disable the localization build])