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

32
configure.ac
View file

@ -1004,15 +1004,13 @@ AC_ARG_WITH(scilabincl,[ --with-scilabincl=path Set location of Scilab 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
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)
else else
AC_MSG_CHECKING(for scilab) AC_MSG_CHECKING(for scilab)
if test -f "$SCILABBIN"; then if test -f "$SCILABBIN"; then
AC_MSG_RESULT($SCILABBIN) AC_MSG_RESULT($SCILABBIN)
@ -1020,12 +1018,11 @@ else
else else
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
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'`
AC_MSG_NOTICE([Scilab version: $SCILAB_FULL_VERSION]) AC_MSG_NOTICE([Scilab version: $SCILAB_FULL_VERSION])
AC_MSG_CHECKING(for Scilab version is 5.2 or higher) AC_MSG_CHECKING(for Scilab version is 5.2 or higher)
@ -1046,12 +1043,11 @@ if test -n "$SCILAB"; then
SCILABSTARTOPT+=" -noatomsautoload" SCILABSTARTOPT+=" -noatomsautoload"
fi fi
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
dirs="$SCILABINCDIR" dirs="$SCILABINCDIR"
SCILABEXT="" SCILABEXT=""
for i in $dirs; do for i in $dirs; do
@ -1073,9 +1069,7 @@ if test "$SCILABINCDIR" != ""; then
AC_MSG_CHECKING(for Scilab compiler options) AC_MSG_CHECKING(for Scilab compiler options)
SCILABCCFLAGS="" SCILABCCFLAGS=""
AC_MSG_RESULT($SCILABCCFLAGS) AC_MSG_RESULT($SCILABCCFLAGS)
fi fi
fi fi
AC_SUBST(SCILAB) AC_SUBST(SCILAB)