No longer compile ordschur.oct for Octave >= 4.0.
The function is now an Octave builtin.time-shift
parent
fde96124f8
commit
d0628af1f2
|
@ -2,12 +2,16 @@ ACLOCAL_AMFLAGS = -I ../../../m4
|
||||||
|
|
||||||
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
|
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
|
||||||
if DO_SOMETHING
|
if DO_SOMETHING
|
||||||
SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv qzcomplex ordschur block_kalman_filter sobol local_state_space_iterations
|
SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv qzcomplex block_kalman_filter sobol local_state_space_iterations
|
||||||
|
|
||||||
if COMPILE_LINSOLVE
|
if COMPILE_LINSOLVE
|
||||||
SUBDIRS += linsolve
|
SUBDIRS += linsolve
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if COMPILE_ORDSCHUR
|
||||||
|
SUBDIRS += ordschur
|
||||||
|
endif
|
||||||
|
|
||||||
if HAVE_MATIO
|
if HAVE_MATIO
|
||||||
SUBDIRS += k_order_perturbation dynare_simul_
|
SUBDIRS += k_order_perturbation dynare_simul_
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
dnl Copyright (C) 2009-2014 Dynare Team
|
dnl Copyright (C) 2009-2015 Dynare Team
|
||||||
dnl
|
dnl
|
||||||
dnl This file is part of Dynare.
|
dnl This file is part of Dynare.
|
||||||
dnl
|
dnl
|
||||||
|
@ -34,9 +34,11 @@ if test "x$MKOCTFILE" != "x"; then
|
||||||
OCTAVE_VERSION=`$MKOCTFILE -v 2>&1 | sed 's/mkoctfile, version //'`
|
OCTAVE_VERSION=`$MKOCTFILE -v 2>&1 | sed 's/mkoctfile, version //'`
|
||||||
AX_COMPARE_VERSION([$OCTAVE_VERSION], [lt], [3.6], [AC_MSG_ERROR([Your Octave is too old, please upgrade to version 3.6 at least.])])
|
AX_COMPARE_VERSION([$OCTAVE_VERSION], [lt], [3.6], [AC_MSG_ERROR([Your Octave is too old, please upgrade to version 3.6 at least.])])
|
||||||
AX_COMPARE_VERSION([$OCTAVE_VERSION], [ge], [3.8], [OCTAVE38=yes])
|
AX_COMPARE_VERSION([$OCTAVE_VERSION], [ge], [3.8], [OCTAVE38=yes])
|
||||||
|
AX_COMPARE_VERSION([$OCTAVE_VERSION], [ge], [4.0], [OCTAVE40=yes])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL([COMPILE_LINSOLVE], [test "$OCTAVE38" != "yes"])
|
AM_CONDITIONAL([COMPILE_LINSOLVE], [test "$OCTAVE38" != "yes"])
|
||||||
|
AM_CONDITIONAL([COMPILE_ORDSCHUR], [test "$OCTAVE40" != "yes"])
|
||||||
|
|
||||||
CFLAGS="$CFLAGS -Wall -Wno-parentheses"
|
CFLAGS="$CFLAGS -Wall -Wno-parentheses"
|
||||||
FFLAGS="$FFLAGS -Wall"
|
FFLAGS="$FFLAGS -Wall"
|
||||||
|
@ -121,6 +123,12 @@ else
|
||||||
BUILD_LINSOLVE_OCTAVE="no (Octave >= 3.8)"
|
BUILD_LINSOLVE_OCTAVE="no (Octave >= 3.8)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test -n "$MKOCTFILE" -a "$OCTAVE40" != "yes"; then
|
||||||
|
BUILD_ORDSCHUR_OCTAVE="yes"
|
||||||
|
else
|
||||||
|
BUILD_ORDSCHUR_OCTAVE="no (Octave >= 4.0)"
|
||||||
|
fi
|
||||||
|
|
||||||
AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [
|
AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [
|
||||||
if test "x$enable_openmp" = "xyes"; then
|
if test "x$enable_openmp" = "xyes"; then
|
||||||
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
|
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
|
||||||
|
@ -139,6 +147,7 @@ Binaries (with "make"):
|
||||||
Kalman Steady State MEX file for Octave: $BUILD_KALMAN_STEADY_STATE_OCTAVE
|
Kalman Steady State MEX file for Octave: $BUILD_KALMAN_STEADY_STATE_OCTAVE
|
||||||
Estimation, k-order and dynare_simul MEX for Octave: $BUILD_ESTIMATION_KORDER_DYNSIMUL_MEX_OCTAVE
|
Estimation, k-order and dynare_simul MEX for Octave: $BUILD_ESTIMATION_KORDER_DYNSIMUL_MEX_OCTAVE
|
||||||
Linsolve for Octave: $BUILD_LINSOLVE_OCTAVE
|
Linsolve for Octave: $BUILD_LINSOLVE_OCTAVE
|
||||||
|
Ordschur for Octave: $BUILD_ORDSCHUR_OCTAVE
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue