Gensylv MEX also needs MatIO (because Dynare++ code does)
parent
2c65f92c6c
commit
c6f5c804d9
|
@ -1,12 +1,11 @@
|
|||
ACLOCAL_AMFLAGS = -I ../../../m4
|
||||
|
||||
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
|
||||
|
||||
if DO_SOMETHING
|
||||
SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv block_kalman_filter sobol local_state_space_iterations
|
||||
SUBDIRS = mjdgges kronecker bytecode block_kalman_filter sobol local_state_space_iterations
|
||||
|
||||
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
|
||||
if HAVE_MATIO
|
||||
SUBDIRS += k_order_perturbation dynare_simul_
|
||||
SUBDIRS += libdynare++ gensylv k_order_perturbation dynare_simul_
|
||||
endif
|
||||
|
||||
if HAVE_GSL
|
||||
|
|
|
@ -117,9 +117,9 @@ else
|
|||
fi
|
||||
|
||||
if test "x$ax_enable_matlab" = "xyes" -a "x$has_matio" = "xyes"; then
|
||||
BUILD_KORDER_DYNSIMUL_MEX_MATLAB="yes"
|
||||
BUILD_GENSYLV_KORDER_DYNSIMUL_MEX_MATLAB="yes"
|
||||
else
|
||||
BUILD_KORDER_DYNSIMUL_MEX_MATLAB="no (missing MatIO library)"
|
||||
BUILD_GENSYLV_KORDER_DYNSIMUL_MEX_MATLAB="no (missing MatIO library)"
|
||||
fi
|
||||
|
||||
if test "x$ax_enable_matlab" = "xyes" -a "x$ax_matlab_version_ok" = "xyes" -a "x$ax_mexopts_ok" = "xyes" -a "x$has_slicot" = "xyes"; then
|
||||
|
@ -158,7 +158,7 @@ Dynare is now configured for building the following components...
|
|||
|
||||
Binaries (with "make"):
|
||||
MEX files for MATLAB (except those listed below): $BUILD_MEX_MATLAB
|
||||
K-order and dynare_simul MEX files for MATLAB: $BUILD_KORDER_DYNSIMUL_MEX_MATLAB
|
||||
Gensylv, k-order and dynare_simul MEX files for MATLAB: $BUILD_GENSYLV_KORDER_DYNSIMUL_MEX_MATLAB
|
||||
MS-SBVAR MEX files for MATLAB: $BUILD_MS_SBVAR_MEX_MATLAB
|
||||
Kalman Steady State MEX file for MATLAB: $BUILD_KALMAN_STEADY_STATE_MATLAB
|
||||
M2HTML documentation: $BUILD_M2HTML
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
ACLOCAL_AMFLAGS = -I ../../../m4
|
||||
|
||||
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
|
||||
if DO_SOMETHING
|
||||
SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv block_kalman_filter sobol local_state_space_iterations
|
||||
SUBDIRS = mjdgges kronecker bytecode block_kalman_filter sobol local_state_space_iterations
|
||||
|
||||
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
|
||||
if HAVE_MATIO
|
||||
SUBDIRS += k_order_perturbation dynare_simul_
|
||||
SUBDIRS += libdynare++ gensylv k_order_perturbation dynare_simul_
|
||||
endif
|
||||
|
||||
if HAVE_GSL
|
||||
|
|
|
@ -56,7 +56,7 @@ AC_SUBST([LIBADD_DLOPEN])
|
|||
AX_GSL
|
||||
AM_CONDITIONAL([HAVE_GSL], [test "x$has_gsl" = "xyes"])
|
||||
|
||||
# Check for libmatio, needed by k-order, dynare_simul, ms-sbvar (only under Octave, as an alternative to MATLAB's libmat)
|
||||
# Check for libmatio, needed by MEX files using Dynare++ code, and by ms-sbvar (the latter only under Octave, as an alternative to MATLAB's libmat)
|
||||
AX_MATIO
|
||||
AM_CONDITIONAL([HAVE_MATIO], [test "x$has_matio" = "xyes"])
|
||||
|
||||
|
@ -88,9 +88,9 @@ else
|
|||
fi
|
||||
|
||||
if test "x$MKOCTFILE" != "x" -a "x$has_matio" = "xyes"; then
|
||||
BUILD_KORDER_DYNSIMUL_MEX_OCTAVE="yes"
|
||||
BUILD_GENSYLV_KORDER_DYNSIMUL_MEX_OCTAVE="yes"
|
||||
else
|
||||
BUILD_KORDER_DYNSIMUL_MEX_OCTAVE="no (missing MatIO library)"
|
||||
BUILD_GENSYLV_KORDER_DYNSIMUL_MEX_OCTAVE="no (missing MatIO library)"
|
||||
fi
|
||||
|
||||
if test "x$MKOCTFILE" != "x" -a "x$has_slicot" = "xyes"; then
|
||||
|
@ -119,9 +119,9 @@ Dynare is now configured for building the following components...
|
|||
|
||||
Binaries (with "make"):
|
||||
MEX files for Octave (except those listed below): $BUILD_MEX_OCTAVE
|
||||
Gensylv, k-order and dynare_simul MEX for Octave: $BUILD_GENSYLV_KORDER_DYNSIMUL_MEX_OCTAVE
|
||||
MS-SBVAR MEX files for Octave: $BUILD_MS_SBVAR_MEX_OCTAVE
|
||||
Kalman Steady State MEX file for Octave: $BUILD_KALMAN_STEADY_STATE_OCTAVE
|
||||
K-order and dynare_simul MEX for Octave: $BUILD_KORDER_DYNSIMUL_MEX_OCTAVE
|
||||
|
||||
])
|
||||
|
||||
|
|
Loading…
Reference in New Issue