Scilab: support of Scilab 5.3.3

Fix: for test suite and examples, run Scilab with -noatomsautoload if Scilab version >=5.4 only
This commit is contained in:
Simon Marchetto 2013-08-07 18:21:18 +02:00
commit d6eb7323b6
2 changed files with 61 additions and 47 deletions

View file

@ -1576,6 +1576,7 @@ SCILAB_INCLUDE = $(DEFS) @SCILABINCLUDE@
SCILAB_LIB = @SCILABLIB@
SCILAB = @SCILAB@
SCILABOPT =
SCILAB_START_OPT = @SCILABSTARTOPT@
# ----------------------------------------------------------------
# Build a C dynamically loadable module
@ -1596,7 +1597,7 @@ scilab: $(SRCS)
fi \
fi
@if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) -nwni -noatomsautoload -nb -f builder.sce; \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) $(SCILAB_START_OPT) -f builder.sce; \
fi
# ----------------------------------------------------------------
@ -1618,7 +1619,7 @@ scilab_cpp: $(SRCS)
fi \
fi
@if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) -nwni -noatomsautoload -nb -f builder.sce; \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) $(SCILAB_START_OPT) -f builder.sce; \
fi
# -----------------------------------------------------------------