SF #2019156 Configuring with --without-octave or --without-alllang did not disable octave.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10676 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
18fb8497ff
commit
5c52b699e3
2 changed files with 8 additions and 2 deletions
|
|
@ -1,6 +1,10 @@
|
|||
Version 1.3.37 (in progress)
|
||||
=============================
|
||||
|
||||
2008-07-17: wsfulton
|
||||
Fix SF #2019156 Configuring with --without-octave or --without-alllang
|
||||
did not disable octave.
|
||||
|
||||
2008-07-14: wsfultonn
|
||||
[Java, C#] Fix director typemaps for pointers so that NULL pointers are correctly
|
||||
marshalled to C#/Java null in director methods.
|
||||
|
|
|
|||
|
|
@ -732,13 +732,13 @@ OCTAVEDYNAMICLINKING=
|
|||
OCTAVE_SO=.oct
|
||||
|
||||
AC_ARG_WITH(octave, AS_HELP_STRING([--without-octave], [Disable Octave])
|
||||
AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[ OCTAVEBIN="$withval"], [OCTAVEBIN=yes])
|
||||
AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[OCTAVEBIN="$withval"], [OCTAVEBIN=yes])
|
||||
|
||||
# First, check for "--without-octave" or "--with-octave=no".
|
||||
if test x"${OCTAVEBIN}" = xno -o x"${with_alllang}" = xno ; then
|
||||
AC_MSG_NOTICE([Disabling Octave])
|
||||
OCTAVE=
|
||||
fi
|
||||
else
|
||||
|
||||
# First figure out what the name of Octave is
|
||||
|
||||
|
|
@ -779,6 +779,8 @@ else
|
|||
AC_MSG_RESULT(could not figure out how to run octave)
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
AC_SUBST(OCTAVE)
|
||||
AC_SUBST(OCTAVEEXT)
|
||||
AC_SUBST(OCTAVE_SO)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue