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

32
configure.ac
View file

@ -995,19 +995,26 @@ AC_ARG_WITH(scilabincl,[ --with-scilabincl=path Set location of Scilab include
if test x"${SCILABBIN}" = xno -o x"${with_alllang}" = xno ; then if test x"${SCILABBIN}" = xno -o x"${with_alllang}" = xno ; then
AC_MSG_NOTICE([Disabling Scilab]) AC_MSG_NOTICE([Disabling Scilab])
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 if test "x$SCILABBIN" = xyes; then
AC_CHECK_PROGS(SCILAB, scilab) AC_CHECK_PROGS(SCILAB, scilab)
else else
SCILAB="$SCILABBIN" SCILAB="$SCILABBIN"
fi fi
AC_MSG_CHECKING(for Scilab header files)
if test -n "$SCILAB"; then if test -n "$SCILAB"; then
if test "$SCILABINCDIR" != ""; then AC_MSG_RESULT([$SCILAB found])
else
AC_MSG_RESULT([$SCILAB not found])
fi
# Check Scilab header files
AC_MSG_CHECKING(for Scilab header files)
if test "$SCILABINCDIR" != ""; then
dirs="$SCILABINCDIR" dirs="$SCILABINCDIR"
SCILABEXT="" SCILABEXT=""
for i in $dirs; do for i in $dirs; do
@ -1025,27 +1032,24 @@ if test -n "$SCILAB"; then
else else
AC_MSG_RESULT($SCILABEXT) AC_MSG_RESULT($SCILABEXT)
fi fi
AC_MSG_CHECKING(for Scilab compiler options)
SCILABCCFLAGS=""
AC_MSG_RESULT($SCILABCCFLAGS)
fi
else
AC_MSG_RESULT(could not figure out how to run scilab)
fi fi
# Set Scilab startup options depending on version # Get Scilab version
AC_MSG_CHECKING(for Scilab version)
SCILAB_VERSION=`$SCILAB -version|sed -e 's|Scilab version \"\(.*\)\"|\1|g'|head -1` 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_MAJOR_VERSION=`echo $SCILAB_VERSION | cut -d. -f1`
SCILAB_MINOR_VERSION=`echo $SCILAB_VERSION | cut -d. -f2` 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" SCILABSTARTOPT="-nwni -nb"
if test "$SCILAB_MAJOR_VERSION" -ge 5 ; then if test "$SCILAB_MAJOR_VERSION" -ge 5 ; then
if test "$SCILAB_MINOR_VERSION" -ge 4 ; then if test "$SCILAB_MINOR_VERSION" -ge 4 ; then
SCILABSTARTOPT+=" -noatomsautoload" SCILABSTARTOPT+=" -noatomsautoload"
fi fi
fi fi
AC_MSG_RESULT($SCILABSTARTOPT)
fi fi