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

Scilab: fix debug infos in config.log

Browse source 
display scilab executable, version and startup options, remove cc options
This commit is contained in:
Simon Marchetto 2013-08-09 12:11:38 +02:00
commit 2f910faebb
1 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

64
configure.ac
View file

@ -995,57 +995,61 @@ AC_ARG_WITH(scilabincl,[ --with-scilabincl=path Set location of Scilab include
if test x"${SCILABBIN}" = xno -o x"${with_alllang}" = xno ; then
AC_MSG_NOTICE([Disabling Scilab])
SCILAB=
else
# First figure out what the name of Scilab is
else
# Check Scilab executable
AC_MSG_CHECKING(for Scilab executable)
if test "x$SCILABBIN" = xyes; then
AC_CHECK_PROGS(SCILAB, scilab)
else
SCILAB="$SCILABBIN"
fi
AC_MSG_CHECKING(for Scilab header files)
if test -n "$SCILAB"; then
if test "$SCILABINCDIR" != ""; then
dirs="$SCILABINCDIR"
SCILABEXT=""
for i in $dirs; do
if test -r $i/scilab/api_scilab.h; then
SCILABEXT="$i"
break;
fi
if test -r $i/scilab/scilab/api_scilab.h; then
SCILABEXT="$i/scilab"
break;
fi
done
if test "$SCILABEXT" = "" ; then
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT($SCILABEXT)
fi
AC_MSG_CHECKING(for Scilab compiler options)
SCILABCCFLAGS=""
AC_MSG_RESULT($SCILABCCFLAGS)
fi
AC_MSG_RESULT([$SCILAB found])
else
AC_MSG_RESULT(could not figure out how to run scilab)
AC_MSG_RESULT([$SCILAB not found])
fi
# Set Scilab startup options depending on version
# Check Scilab header files
AC_MSG_CHECKING(for Scilab header files)
if test "$SCILABINCDIR" != ""; then
dirs="$SCILABINCDIR"
SCILABEXT=""
for i in $dirs; do
if test -r $i/scilab/api_scilab.h; then
SCILABEXT="$i"
break;
fi
if test -r $i/scilab/scilab/api_scilab.h; then
SCILABEXT="$i/scilab"
break;
fi
done
if test "$SCILABEXT" = "" ; then
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT($SCILABEXT)
fi
fi
# Get Scilab version
AC_MSG_CHECKING(for Scilab version)
SCILAB_VERSION=`$SCILAB -version|sed -e 's|Scilab version \"\(.*\)\"|\1|g'|head -1`
AC_MSG_RESULT(Found Scilab version $SCILAB_VERSION)
AC_MSG_RESULT($SCILAB_VERSION)
SCILAB_MAJOR_VERSION=`echo $SCILAB_VERSION | cut -d. -f1`
SCILAB_MINOR_VERSION=`echo $SCILAB_VERSION | cut -d. -f2`
# Set Scilab startup options depending on version
AC_MSG_CHECKING(for Scilab startup options)
SCILABSTARTOPT="-nwni -nb"
if test "$SCILAB_MAJOR_VERSION" -ge 5 ; then
if test "$SCILAB_MINOR_VERSION" -ge 4 ; then
SCILABSTARTOPT+=" -noatomsautoload"
fi
fi
AC_MSG_RESULT($SCILABSTARTOPT)
fi