Merge remote-tracking branch 'origin/5.5'
[scilab.git] / scilab / configure.ac
index 433059f..75c5c8f 100644 (file)
@@ -37,8 +37,8 @@ else
 fi
 
 SCILAB_VERSION_MAJOR=5
-SCILAB_VERSION_MINOR=5
-SCILAB_VERSION_MAINTENANCE=2
+SCILAB_VERSION_MINOR=6
+SCILAB_VERSION_MAINTENANCE=0
 AC_SUBST(SCILAB_VERSION_MAJOR)
 AC_SUBST(SCILAB_VERSION_MINOR)
 AC_SUBST(SCILAB_VERSION_MAINTENANCE)
@@ -765,21 +765,20 @@ AM_CONDITIONAL(EXTERNAL_SCIRENDERER, test "$with_external_scirenderer" = yes)
 #################
 
 AC_ARG_WITH(xcos,
-    AC_HELP_STRING([--without-xcos],[Disable Xcos]))
+    AC_HELP_STRING([--without-xcos], [Disable Xcos]))
 
 AC_ARG_WITH(modelica,
     AC_HELP_STRING([--without-modelica],[Disable the OCaml module (modelica)]))
 
 
 if test "$with_gui" = no; then
-   AC_MSG_WARN([GUI is disabled. Disabling then xcos])
-   with_xcos=no
+   AC_MSG_WARN([GUI is disabled. Disabling then Xcos GUI])
 fi
 
 XCOS_ENABLE=no
 
-if test "$with_xcos" != no -a "$with_gui" != no; then
-   AC_DEFINE([WITH_XCOS], [], [With XCOS])
+if test "$with_xcos" != no; then
+   AC_DEFINE([WITH_XCOS], [], [with XCos])
 
    save_LIBS="$LIBS"
 
@@ -862,7 +861,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
 
         if test "$with_gui" != no; then
 
-                if test $XCOS_ENABLE = yes; then
+                if test "$with_xcos" != no; then
                    # jgraphx
                    AC_JAVA_CHECK_PACKAGE([jgraphx],[com.mxgraph.model.mxCell],[Diagram design])
                    JGRAPHX=$PACKAGE_JAR_FILE