Skip to content

Commit bdfaa26

Browse files
committed
* src/configure.ac: remove checks for old octave versions
1 parent 5c20251 commit bdfaa26

File tree

1 file changed

+1
-87
lines changed

1 file changed

+1
-87
lines changed

src/configure.ac

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -68,29 +68,7 @@ AC_CHECK_HEADERS([octave/interpreter.h octave/oct-time.h],
6868
[#include <octave/oct.h>]
6969
)
7070

71-
# need to use interpreter->get_load_path in dev version of octave,
72-
# prior to that methods of load_path were static
73-
AC_CACHE_CHECK(
74-
[interpreter get_load_path],
75-
[octave_cv_interpreter_get_load_path],
76-
[AC_COMPILE_IFELSE(
77-
[AC_LANG_PROGRAM([
78-
#include <octave/oct.h>
79-
#include <octave/octave.h>
80-
#include <octave/interpreter.h>
81-
#include <octave/load-path.h>
82-
],
83-
[
84-
octave::load_path &p = octave::interpreter::the_interpreter ()->get_load_path ();
85-
])],
86-
[octave_cv_interpreter_get_load_path=yes],
87-
[octave_cv_interpreter_get_load_path=no])
88-
])
89-
if test "$octave_cv_interpreter_get_load_path" = "yes" ; then
90-
AC_DEFINE(HAVE_OCTAVE_LOAD_PATH,[1],[Whether we have the interpreter load path])
91-
fi
92-
93-
dnl NOTE: most of these are to handle octave < 4.0 so probally not needed
71+
dnl since we Octave 6+, there are not many types that have changed
9472
OF_OCTAVE_LIST_ALT_SYMS([
9573
9674
[dnl
@@ -111,81 +89,17 @@ OF_OCTAVE_LIST_ALT_SYMS([
11189
[[#include <octave/oct-time.h>]]
11290
],
11391
114-
[dnl
115-
[is_float_type],
116-
[isfloat],
117-
[[octave_value ().isfloat ();]],
118-
[OV_ISFLOAT],
119-
[],
120-
[]
121-
],
122-
123-
[dnl
124-
[is_integer_type],
125-
[isinteger],
126-
[[octave_value ().isinteger ();]],
127-
[OV_ISINTEGER],
128-
[],
129-
[]
130-
],
131-
132-
[dnl
133-
[is_bool_type],
134-
[islogical],
135-
[[octave_value ().islogical ();]],
136-
[OV_ISLOGICAL],
137-
[],
138-
[]
139-
],
140-
14192
[dnl
14293
[octave_base_value],
14394
[octave_base_dld_value],
14495
[[octave_base_dld_value tmp();]],
14596
[OCTAVE_BASE_CLASS],
14697
[],
14798
[]
148-
],
149-
150-
[dnl
151-
[octave_execution_exception],
152-
[octave::execution_exception],
153-
[[octave::execution_exception err;]],
154-
[OCTAVE_EXECUTION_EXCEPTION],
155-
[#include <octave/quit.h>],
156-
[#include <octave/quit.h>]
15799
]
158100
159101
],[oct-alt-includes.h])
160102

161-
# check if method of getting execution exception message
162-
AC_MSG_CHECKING([for execution_exception message field])
163-
octave_execution_field=none
164-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
165-
#include <octave/oct.h>
166-
#include <octave/quit.h>
167-
]], [
168-
OCTAVE_EXECUTION_EXCEPTION err; err.message();
169-
])],
170-
[octave_execution_field=message],
171-
[
172-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
173-
#include <octave/oct.h>
174-
#include <octave/quit.h>
175-
]], [
176-
OCTAVE_EXECUTION_EXCEPTION err; err.info();
177-
])],
178-
[octave_execution_field=info],
179-
[])
180-
]
181-
)
182-
AC_MSG_RESULT([$octave_execution_field])
183-
AC_DEFINE_UNQUOTED([OCTAVE_EXCEPTION_MESSAGE],$octave_execution_field,[execution_exception message field])
184-
185-
if test $octave_execution_field != none; then
186-
AC_DEFINE([HAS_OCTAVE_EXCEPTION_MESSAGE],[1],[has some kid of execution_exception message field])
187-
fi
188-
189103
CC=$save_CXX
190104
CXXFLAGS=$save_CXXFLAGS
191105
LIBS="$save_LIBS"

0 commit comments

Comments
 (0)