Mercurial > pytave
diff m4/ax_octave.m4 @ 167:f31a5f5b5269
maint: remove workarounds and comments on old Octave versions
* ax_octave.m4 (AX_OCTAVE): Use AS_DIRNAME for parent directory. Remove
checking message.
* octave_to_python.cc (pytave::octlist_to_pytuple): Remove workaround for
bug in old version of Octave.
* pytave.cc (pytave::delvar): Likewise.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Wed, 06 Apr 2016 15:21:51 -0700 |
| parents | 3af7523b395a |
| children | 277b1e172123 |
line wrap: on
line diff
--- a/m4/ax_octave.m4 Wed Apr 06 14:42:18 2016 -0700 +++ b/m4/ax_octave.m4 Wed Apr 06 15:21:51 2016 -0700 @@ -135,14 +135,8 @@ ]) AS_IF([test -z "$ax_octave_ok"], [ - # After the 3.2 series, the include path ends with - # /octave, but that part we don't want. - AC_MSG_CHECKING([[if the include directory is 3.3+ style]]) if test -f "$OCTAVE_INCLUDEDIR/oct.h" ; then - OCTAVE_INCLUDEDIR="$OCTAVE_INCLUDEDIR/.." - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) + OCTAVE_INCLUDEDIR=`AS_DIRNAME(["$OCTAVE_INCLUDEDIR"])` fi OCTAVE_LDFLAGS="-L$OCTAVE_LIBRARYDIR"