Verified Commit c6f5c804 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Gensylv MEX also needs MatIO (because Dynare++ code does)

parent 2c65f92c
ACLOCAL_AMFLAGS = -I ../../../m4 ACLOCAL_AMFLAGS = -I ../../../m4
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
if DO_SOMETHING 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 if HAVE_MATIO
SUBDIRS += k_order_perturbation dynare_simul_ SUBDIRS += libdynare++ gensylv k_order_perturbation dynare_simul_
endif endif
if HAVE_GSL if HAVE_GSL
......
...@@ -117,9 +117,9 @@ else ...@@ -117,9 +117,9 @@ else
fi fi
if test "x$ax_enable_matlab" = "xyes" -a "x$has_matio" = "xyes"; then 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 else
BUILD_KORDER_DYNSIMUL_MEX_MATLAB="no (missing MatIO library)" BUILD_GENSYLV_KORDER_DYNSIMUL_MEX_MATLAB="no (missing MatIO library)"
fi 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 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... ...@@ -158,7 +158,7 @@ Dynare is now configured for building the following components...
Binaries (with "make"): Binaries (with "make"):
MEX files for MATLAB (except those listed below): $BUILD_MEX_MATLAB 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 MS-SBVAR MEX files for MATLAB: $BUILD_MS_SBVAR_MEX_MATLAB
Kalman Steady State MEX file for MATLAB: $BUILD_KALMAN_STEADY_STATE_MATLAB Kalman Steady State MEX file for MATLAB: $BUILD_KALMAN_STEADY_STATE_MATLAB
M2HTML documentation: $BUILD_M2HTML M2HTML documentation: $BUILD_M2HTML
......
ACLOCAL_AMFLAGS = -I ../../../m4 ACLOCAL_AMFLAGS = -I ../../../m4
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
if DO_SOMETHING 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 if HAVE_MATIO
SUBDIRS += k_order_perturbation dynare_simul_ SUBDIRS += libdynare++ gensylv k_order_perturbation dynare_simul_
endif endif
if HAVE_GSL if HAVE_GSL
......
...@@ -56,7 +56,7 @@ AC_SUBST([LIBADD_DLOPEN]) ...@@ -56,7 +56,7 @@ AC_SUBST([LIBADD_DLOPEN])
AX_GSL AX_GSL
AM_CONDITIONAL([HAVE_GSL], [test "x$has_gsl" = "xyes"]) 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 AX_MATIO
AM_CONDITIONAL([HAVE_MATIO], [test "x$has_matio" = "xyes"]) AM_CONDITIONAL([HAVE_MATIO], [test "x$has_matio" = "xyes"])
...@@ -88,9 +88,9 @@ else ...@@ -88,9 +88,9 @@ else
fi fi
if test "x$MKOCTFILE" != "x" -a "x$has_matio" = "xyes"; then 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 else
BUILD_KORDER_DYNSIMUL_MEX_OCTAVE="no (missing MatIO library)" BUILD_GENSYLV_KORDER_DYNSIMUL_MEX_OCTAVE="no (missing MatIO library)"
fi fi
if test "x$MKOCTFILE" != "x" -a "x$has_slicot" = "xyes"; then if test "x$MKOCTFILE" != "x" -a "x$has_slicot" = "xyes"; then
...@@ -119,9 +119,9 @@ Dynare is now configured for building the following components... ...@@ -119,9 +119,9 @@ Dynare is now configured for building the following components...
Binaries (with "make"): Binaries (with "make"):
MEX files for Octave (except those listed below): $BUILD_MEX_OCTAVE 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 MS-SBVAR MEX files for Octave: $BUILD_MS_SBVAR_MEX_OCTAVE
Kalman Steady State MEX file for Octave: $BUILD_KALMAN_STEADY_STATE_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
]) ])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment