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

Scilab configure tidy up

Browse source
This commit is contained in:
William S Fulton 2013-08-30 22:20:19 +01:00
commit fe12f8ccd7
1 changed files with 59 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -1006,9 +1006,7 @@ 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
# Check for Scilab executable # Check 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)
@ -1022,7 +1020,6 @@ else
fi fi
fi fi
if test -n "$SCILAB"; then if test -n "$SCILAB"; then
# Check for Scilab version (needs api_scilab so needs version 5.2 or higher) # Check for Scilab version (needs api_scilab so needs version 5.2 or higher)
SCILAB_FULL_VERSION=`$SCILAB -version | head -1 | sed -e 's|Scilab version \"\(.*\)\"|\1|g'` SCILAB_FULL_VERSION=`$SCILAB -version | head -1 | sed -e 's|Scilab version \"\(.*\)\"|\1|g'`
@ -1048,7 +1045,6 @@ if test -n "$SCILAB"; then
AC_MSG_RESULT($SCILABSTARTOPT) AC_MSG_RESULT($SCILABSTARTOPT)
fi fi
# Check for Scilab header files # Check for Scilab header files
AC_MSG_CHECKING(for Scilab header files) AC_MSG_CHECKING(for Scilab header files)
if test "$SCILABINCDIR" != ""; then if test "$SCILABINCDIR" != ""; then
@ -1074,8 +1070,6 @@ if test "$SCILABINCDIR" != ""; then
SCILABCCFLAGS="" SCILABCCFLAGS=""
AC_MSG_RESULT($SCILABCCFLAGS) AC_MSG_RESULT($SCILABCCFLAGS)
fi fi
fi fi
AC_SUBST(SCILAB) AC_SUBST(SCILAB)