jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scilab: in configure.ac SCILABSTARTOPT => SCILABOPT

Browse source
This commit is contained in:
Simon Marchetto 2014-05-22 10:04:15 +02:00
commit a11a3bdd66
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Examples/Makefile.in
View file

@ -1554,12 +1554,11 @@ r_clean:
# Make sure these locate your Scilab installation
SCILAB_LIB = @SCILABLIB@
SCILAB = @SCILAB@
SCILABOPT =
SCILAB_STARTOPT = @SCILABSTARTOPT@
SCILAB_OPT = @SCILABOPT@
# Returns the Swig Scilab command line args
define get_swig_scilab_args
SWIG_SCILAB_ARGS := -scilab $(SCILABOPT)
SWIG_SCILAB_ARGS := -scilab
ifdef SRCS
SWIG_SCILAB_ARGS += -addsrc "$(SRCS)"
endif
@ -1576,7 +1575,7 @@ scilab: $(SRCS)
$(eval $(call get_swig_scilab_args))
$(SWIG) $(SWIGOPT) $(SWIG_SCILAB_ARGS) $(INTERFACEPATH)
if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_STARTOPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
fi
# ----------------------------------------------------------------
@ -1587,7 +1586,7 @@ scilab_cpp: $(SRCS)
$(eval $(call get_swig_scilab_args))
$(SWIG) $(SWIGOPT) -c++ $(SWIG_SCILAB_ARGS) $(INTERFACEPATH)
if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_STARTOPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \
fi
# -----------------------------------------------------------------
@ -1596,7 +1595,7 @@ scilab_cpp: $(SRCS)
scilab_run:
if [ -f $(RUNME) ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $( SCILAB_STARTOPT) -f $(RUNME).sci $(RUNPIPE); \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -f $(RUNME).sci $(RUNPIPE); \
fi
# -----------------------------------------------------------------

8
configure.ac
View file

@ -964,11 +964,11 @@ else
# Set Scilab startup options depending on version
AC_MSG_CHECKING(for Scilab startup options)
SCILABSTARTOPT="-nwni -nb"
SCILABOPT="-nwni -nb"
if test $SCILAB_VERSION -ge 54; then
SCILABSTARTOPT+=" -noatomsautoload"
SCILABOPT+=" -noatomsautoload"
fi
AC_MSG_RESULT($SCILABSTARTOPT)
AC_MSG_RESULT($SCILABOPT)
fi
# Check for Scilab header files
@ -996,7 +996,7 @@ else
fi
AC_SUBST(SCILAB)
AC_SUBST(SCILABSTARTOPT)
AC_SUBST(SCILABOPT)
#----------------------------------------------------------------