diff --git a/mex/build/matlab/Makefile.am b/mex/build/matlab/Makefile.am index 234b2e48cfef737e4f993f90c04a08db27949a97..a97e0e5b1ad75b616b14337417477c65a2b6c907 100644 --- a/mex/build/matlab/Makefile.am +++ b/mex/build/matlab/Makefile.am @@ -4,15 +4,15 @@ ACLOCAL_AMFLAGS = -I ../../../m4 if DO_SOMETHING SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ logposterior logMHMCMCposterior +if HAVE_GSL +SUBDIRS += swz +endif + # libslicot must come before kalman_steady_state if HAVE_FORT SUBDIRS += libslicot kalman_steady_state endif -if HAVE_GSL -SUBDIRS += swz -endif - if HAVE_M2HTML html-local: echo "addpath ${M2HTML}" > run_m2html.m diff --git a/mex/build/matlab/configure.ac b/mex/build/matlab/configure.ac index 9d98c3ad5284d9bbe693d6f64f95b1d5199a1370..319772ed4f404bd616bbe49e9084f7339ee235fd 100644 --- a/mex/build/matlab/configure.ac +++ b/mex/build/matlab/configure.ac @@ -96,9 +96,9 @@ else fi if test "x$ax_enable_matlab" = "xyes" -a "x$ax_matlab_version_ok" = "xyes" -a "x$ax_mexopts_ok" = "xyes" -a "x$F77" != "x"; then - BUILD_LIBSLICOT_MATLAB="yes" + BUILD_KALMAN_STEADY_STATE_MATLAB="yes" else - BUILD_LIBSLICOT_MATLAB="no (missing Fortran Compiler)" + BUILD_KALMAN_STEADY_STATE_MATLAB="no (missing Fortran Compiler for compilation of libslicot)" fi AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [ @@ -124,10 +124,10 @@ AC_MSG_NOTICE([ Dynare is now configured for building the following components... Binaries (with "make"): - MEX files for MATLAB (except SWZ): $BUILD_MEX_MATLAB - Libslicot library: $BUILD_LIBSLICOT_MATLAB - SWZ MEX files for MATLAB: $BUILD_SWZ_MEX_MATLAB - M2HTML documentation: $BUILD_M2HTML + MEX files for MATLAB (except SWZ and Kalman Steady State): $BUILD_MEX_MATLAB + SWZ MEX files for MATLAB: $BUILD_SWZ_MEX_MATLAB + Kalman Steady State MEX file for MATLAB: $BUILD_KALMAN_STEADY_STATE_MATLAB + M2HTML documentation: $BUILD_M2HTML ]) diff --git a/mex/build/octave/Makefile.am b/mex/build/octave/Makefile.am index 0ee37596978afcce4202a6d1eb64336a9c454c1e..bc077d8e876173b51784bcadc156cd96cdedb99f 100644 --- a/mex/build/octave/Makefile.am +++ b/mex/build/octave/Makefile.am @@ -4,13 +4,15 @@ ACLOCAL_AMFLAGS = -I ../../../m4 if DO_SOMETHING SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ qzcomplex ordschur +if HAVE_GSL +SUBDIRS += swz +endif + # libslicot must come before kalman_steady_state if HAVE_FORT SUBDIRS += libslicot kalman_steady_state endif -if HAVE_GSL -SUBDIRS += swz -endif + if HAVE_MATIO SUBDIRS += logposterior logMHMCMCposterior endif diff --git a/mex/build/octave/configure.ac b/mex/build/octave/configure.ac index e148de74bd28b66fcd50dd2472c8ccbc837a2228..3addfe3a46d7c6bed22a9b9b06ddd2462362fd8f 100644 --- a/mex/build/octave/configure.ac +++ b/mex/build/octave/configure.ac @@ -91,9 +91,9 @@ else fi if test "x$MKOCTFILE" != "x" -a "x$F77" != "x"; then - BUILD_LIBSLICOT_OCTAVE="yes" + BUILD_KALMAN_STEADY_STATE_OCTAVE="yes" else - BUILD_LIBSLICOT_OCTAVE="no (missing Fortran Compiler)" + BUILD_KALMAN_STEADY_STATE_OCTAVE="no (missing Fortran Compiler for compilation of libslicot)" fi AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [ @@ -109,10 +109,10 @@ AC_MSG_NOTICE([ Dynare is now configured for building the following components... Binaries (with "make"): - MEX files for Octave (except SWZ): $BUILD_MEX_OCTAVE - Libslicot library: $BUILD_LIBSLICOT_OCTAVE - SWZ MEX files for Octave: $BUILD_SWZ_MEX_OCTAVE - Estimation MEX for Octave: $BUILD_ESTIMATION_MEX_OCTAVE + MEX files for Octave (except SWZ and Kalman Steady State): $BUILD_MEX_OCTAVE + SWZ MEX files for Octave: $BUILD_SWZ_MEX_OCTAVE + Kalman Steady State MEX file for Octave: $BUILD_KALMAN_STEADY_STATE_OCTAVE + Estimation MEX for Octave: $BUILD_ESTIMATION_MEX_OCTAVE ])