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

Revert "Scilab: fix debug infos in config.log"

Browse source 
This reverts commit 2f910faebb.
This commit is contained in:
Simon Marchetto 2013-08-09 14:54:36 +02:00
commit 498ca722e5
1 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

58
configure.ac
View file

@ -995,61 +995,57 @@ 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 else
# First figure out what the name of Scilab is
# 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
if test -n "$SCILAB"; 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) AC_MSG_CHECKING(for Scilab header files)
if test "$SCILABINCDIR" != ""; then if test -n "$SCILAB"; then
dirs="$SCILABINCDIR" if test "$SCILABINCDIR" != ""; then
SCILABEXT="" dirs="$SCILABINCDIR"
for i in $dirs; do SCILABEXT=""
if test -r $i/scilab/api_scilab.h; then for i in $dirs; do
SCILABEXT="$i" if test -r $i/scilab/api_scilab.h; then
break; 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
if test -r $i/scilab/scilab/api_scilab.h; then
SCILABEXT="$i/scilab" AC_MSG_CHECKING(for Scilab compiler options)
break; SCILABCCFLAGS=""
fi AC_MSG_RESULT($SCILABCCFLAGS)
done
if test "$SCILABEXT" = "" ; then
AC_MSG_RESULT(not found)
else
AC_MSG_RESULT($SCILABEXT)
fi fi
else
AC_MSG_RESULT(could not figure out how to run scilab)
fi fi
# Get Scilab version # Set Scilab startup options depending on 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($SCILAB_VERSION) AC_MSG_RESULT(Found Scilab version $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