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

Scilab: fix configure with-scilab-inc option

Browse source
This commit is contained in:
Simon Marchetto 2013-10-09 11:14:46 +02:00
commit 03181491b4
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/Makefile.in
View file

@ -1585,7 +1585,7 @@ define get_swig_scilab_args
SWIG_SCILAB_ARGS += -addsrc "$(SRCS)" SWIG_SCILAB_ARGS += -addsrc "$(SRCS)"
endif endif
ifdef INCLUDES ifdef INCLUDES
SWIG_SCILAB_ARGS += -addcflag "$(INCLUDES)" SWIG_SCILAB_ARGS += -addcflag "$(SCILAB_INCLUDE) $(INCLUDES)"
endif endif
endef endef

13
configure.ac
View file

@ -1000,7 +1000,7 @@ SCILABDYNAMICLINKING=
AC_ARG_WITH(scilab, AS_HELP_STRING([--without-scilab], [Disable Scilab]) AC_ARG_WITH(scilab, AS_HELP_STRING([--without-scilab], [Disable Scilab])
AS_HELP_STRING([--with-scilab=path], [Set location of Scilab executable]),[SCILABBIN="$withval"], [SCILABBIN=yes]) AS_HELP_STRING([--with-scilab=path], [Set location of Scilab executable]),[SCILABBIN="$withval"], [SCILABBIN=yes])
AC_ARG_WITH(scilabincl,[ --with-scilabincl=path Set location of Scilab include directory],[SCILABINCDIR="$withval"], [SCILABINCDIR="/usr/include"]) AC_ARG_WITH(scilab-inc, [ --with-scilab-inc=path Set location of Scilab include directory], [SCILABINCDIR="$withval"], [SCILABINCDIR="/usr/include"])
# First, check for "--without-scilab" or "--with-scilab=no". # First, check for "--without-scilab" or "--with-scilab=no".
if test x"${SCILABBIN}" = xno -o x"${with_alllang}" = xno ; then if test x"${SCILABBIN}" = xno -o x"${with_alllang}" = xno ; then
@ -1049,21 +1049,20 @@ else
AC_MSG_CHECKING(for Scilab header files) AC_MSG_CHECKING(for Scilab header files)
if test "$SCILABINCDIR" != ""; then if test "$SCILABINCDIR" != ""; then
dirs="$SCILABINCDIR" dirs="$SCILABINCDIR"
SCILABEXT=""
for i in $dirs; do for i in $dirs; do
if test -r $i/scilab/api_scilab.h; then if test -r $i/scilab/api_scilab.h; then
SCILABEXT="$i" SCILABINCLUDE="$i"
break; break;
fi fi
if test -r $i/scilab/scilab/api_scilab.h; then if test -r $i/scilab/scilab/api_scilab.h; then
SCILABEXT="$i/scilab" SCILABINCLUDE="$i/scilab"
break; break;
fi fi
done done
if test "$SCILABEXT" = "" ; then if test "$SCILABINCLUDE" = "" ; then
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
else else
AC_MSG_RESULT($SCILABEXT) AC_MSG_RESULT($SCILABINCLUDE)
fi fi
AC_MSG_CHECKING(for Scilab compiler options) AC_MSG_CHECKING(for Scilab compiler options)
@ -1073,7 +1072,7 @@ else
fi fi
AC_SUBST(SCILAB) AC_SUBST(SCILAB)
AC_SUBST(SCILABEEXT) AC_SUBST(SCILABINCLUDE)
AC_SUBST(SCILABDYNAMICLINKING) AC_SUBST(SCILABDYNAMICLINKING)
AC_SUBST(SCILABLIB) AC_SUBST(SCILABLIB)
AC_SUBST(SCILABCCFLAGS) AC_SUBST(SCILABCCFLAGS)