Merge remote-tracking branch 'origin/master' into YaSp
[scilab.git] / scilab / configure.ac
index d1f9851..bb01467 100644 (file)
@@ -790,9 +790,8 @@ AM_CONDITIONAL(EXTERNAL_SCIRENDERER, test "$with_external_scirenderer" = yes)
 ## XCOS
 #################
 
-AC_ARG_WITH(xcos, [], [with_jgraphx='no'])
-AC_ARG_WITH(jgraphx,
-    AC_HELP_STRING([--without-jgraphx],[Disable Xcos GUI]))
+AC_ARG_WITH(xcos,
+    AC_HELP_STRING([--without-xcos], [Disable Xcos]))
 
 AC_ARG_WITH(modelica,
     AC_HELP_STRING([--without-modelica],[Disable the OCaml module (modelica)]))
@@ -800,13 +799,12 @@ AC_ARG_WITH(modelica,
 
 if test "$with_gui" = no; then
    AC_MSG_WARN([GUI is disabled. Disabling then Xcos GUI])
-   with_jgraphx=no
 fi
 
 XCOS_ENABLE=no
 
-if test "$with_jgraphx" != no -a "$with_gui" != no; then
-   AC_DEFINE([WITH_JGRAPHX], [], [with JGraphX])
+if test "$with_xcos" != no; then
+   AC_DEFINE([WITH_XCOS], [], [with XCos])
 
    save_LIBS="$LIBS"
 
@@ -889,7 +887,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
 
         if test "$with_gui" != no; then
 
-                if test "$with_jgraphx" != no; then
+                if test "$with_xcos" != no; then
                    # jgraphx
                    AC_JAVA_CHECK_PACKAGE([jgraphx],[com.mxgraph.model.mxCell],[Diagram design])
                    JGRAPHX=$PACKAGE_JAR_FILE