Mercurial > octave

diff libinterp/oct-conf.in.h @ 21131:54527108599a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
store more --enable-FEATURE info in octave_config_info * configure.ac: (ENABLE_64, ENABLE_BOUNDS_CHECK, ENABLE_DOCS, ENABLE_FLOAT_TRUNCATE, ENABLE_JIT, ENABLE_OPENMP): New variables. macros. Handle consistently and AC_DEFINE them. * common.mk, toplev.cc, oct-conf.in.h: Substitute new variables and store them in octave_config_info. * oct-conf-post.in.h: Provide old macro names for compatibility. * Array.cc, Array.h, DiagArray2.h, PermMatrix.h, Range.cc, Sparse.h, dim-vector.h, idx-vector.h, oct-refcount.h: Fix uses of macros.
author John W. Eaton <jwe@octave.org>
date Thu, 21 Jan 2016 18:18:16 -0500
parents f7084eae3318
children e06e600f396a
line wrap: on
line diff
--- a/libinterp/oct-conf.in.h	Thu Jan 21 18:12:34 2016 -0500
+++ b/libinterp/oct-conf.in.h	Thu Jan 21 18:18:16 2016 -0500
@@ -214,10 +214,34 @@
 #define OCTAVE_CONF_DL_LIBS %OCTAVE_CONF_DL_LIBS%
 #endif
 
+#ifndef OCTAVE_CONF_ENABLE_64
+#define OCTAVE_CONF_ENABLE_64 %OCTAVE_CONF_ENABLE_64%
+#endif
+
+#ifndef OCTAVE_CONF_ENABLE_BOUNDS_CHECK
+#define OCTAVE_CONF_ENABLE_BOUNDS_CHECK %OCTAVE_CONF_ENABLE_BOUNDS_CHECK%
+#endif
+
+#ifndef OCTAVE_CONF_ENABLE_DOCS
+#define OCTAVE_CONF_ENABLE_DOCS %OCTAVE_CONF_ENABLE_DOCS%
+#endif
+
 #ifndef OCTAVE_CONF_ENABLE_DYNAMIC_LINKING
 #define OCTAVE_CONF_ENABLE_DYNAMIC_LINKING %OCTAVE_CONF_ENABLE_DYNAMIC_LINKING%
 #endif
 
+#ifndef OCTAVE_CONF_ENABLE_FLOAT_TRUNCATE
+#define OCTAVE_CONF_ENABLE_FLOAT_TRUNCATE %OCTAVE_CONF_ENABLE_FLOAT_TRUNCATE%
+#endif
+
+#ifndef OCTAVE_CONF_ENABLE_JIT
+#define OCTAVE_CONF_ENABLE_JIT %OCTAVE_CONF_ENABLE_JIT%
+#endif
+
+#ifndef OCTAVE_CONF_ENABLE_OPENMP
+#define OCTAVE_CONF_ENABLE_OPENMP %OCTAVE_CONF_ENABLE_OPENMP%
+#endif
+
 #ifndef OCTAVE_CONF_EXEEXT
 #define OCTAVE_CONF_EXEEXT %OCTAVE_CONF_EXEEXT%
 #endif