Merge remote-tracking branch 'origin/5.5'
[scilab.git] / scilab / configure
index c95ce97..fd0e339 100755 (executable)
@@ -3140,8 +3140,8 @@ else
 fi
 
 SCILAB_VERSION_MAJOR=5
-SCILAB_VERSION_MINOR=5
-SCILAB_VERSION_MAINTENANCE=3
+SCILAB_VERSION_MINOR=6
+SCILAB_VERSION_MAINTENANCE=0
 
 
 
 
 
 if test "$with_gui" = no; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GUI is disabled. Disabling then xcos" >&5
-$as_echo "$as_me: WARNING: GUI is disabled. Disabling then xcos" >&2;}
-   with_xcos=no
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GUI is disabled. Disabling then Xcos GUI" >&5
+$as_echo "$as_me: WARNING: GUI is disabled. Disabling then Xcos GUI" >&2;}
 fi
 
 XCOS_ENABLE=no
 
-if test "$with_xcos" != no -a "$with_gui" != no; then
+if test "$with_xcos" != no; then
 
 $as_echo "#define WITH_XCOS /**/" >>confdefs.h
 
@@ -13068,7 +13067,7 @@ fi
 
         if test "$with_gui" != no; then
 
-                if test $XCOS_ENABLE = yes; then
+                if test "$with_xcos" != no; then
                    # jgraphx
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgraphx" >&5