mex/build/kronecker.am

-noinst_PROGRAMS = sparse_hessian_times_B_kronecker_C A_times_B_kronecker_C
+mex_PROGRAMS = sparse_hessian_times_B_kronecker_C A_times_B_kronecker_C
 
 nodist_sparse_hessian_times_B_kronecker_C_SOURCES = $(top_srcdir)/../../sources/kronecker/sparse_hessian_times_B_kronecker_C.cc
 nodist_A_times_B_kronecker_C_SOURCES = $(top_srcdir)/../../sources/kronecker/A_times_B_kronecker_C.cc

mex/build/local_state_space_iterations.am

 vpath %.cc $(top_srcdir)/../../sources/local_state_space_iterations
 
-noinst_PROGRAMS = local_state_space_iteration_2
+mex_PROGRAMS = local_state_space_iteration_2
 
 nodist_local_state_space_iteration_2_SOURCES = local_state_space_iteration_2.cc

mex/build/matlab/Makefile.am

@@ -10,7 +10,7 @@ SUBDIRS += k_order_perturbation dynare_simul_
 endif
 
 if HAVE_GSL
-SUBDIRS += ms_sbvar estimation
+SUBDIRS += ms_sbvar
 endif
 
 if HAVE_SLICOT
@@ -29,6 +29,9 @@ clean-local:
 	rm -f run_m2html.m
 	rm -rf ../../../doc/m2html
 endif
+
+install-exec-local:
+	$(MKDIR_P) $(DESTDIR)$(pkglibdir)/mex/matlab
 endif
 
 EXTRA_DIST = mex.def mexFunction-MacOSX.map

mex/build/matlab/configure.ac

@@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.62])
-AC_INIT([dynare], [4.4-unstable])
+AC_INIT([dynare], [4.4.3])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
 
@@ -47,6 +47,9 @@ case ${host_os} in
     AC_MSG_WARN([not run from MATLAB, because it cannot load the Cygwin DLL.])
     AC_MSG_WARN([This is probably not what you want. Consider using a MinGW cross-compiler.])
     ;;
+  *darwin13*)
+    CXXFLAGS="$CXXFLAGS -std=c++11"
+    ;;
 esac
 
 CFLAGS="$CFLAGS -Wall -Wno-parentheses"
@@ -60,16 +63,15 @@ AC_PROG_RANLIB
 AX_PROG_LN_S
 AC_PROG_MKDIR_P
 AM_PROG_AR
+
+case ${host_os} in
+  *mingw32*)
+    # Ensure that -lpthread is statically linked under MinGW
+    PTHREAD_LIBS="-Wl,-Bstatic -lpthread -Wl,-Bdynamic"
+    ;;
+esac
 AX_PTHREAD
-# Check for boost libraries used in estimation DLL
-AC_LANG_PUSH([C++])
-AX_BOOST_BASE([1.36])
-CPPFLAGS_SAVED="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-AC_CHECK_HEADER([boost/random/linear_congruential.hpp], [], [AC_MSG_ERROR([Can't find Boost Random Library])])
-AC_CHECK_HEADER([boost/math/distributions/beta.hpp], [], [AC_MSG_ERROR([Can't find Boost Math Library])])
-CPPFLAGS="$CPPFLAGS_SAVED"
-AC_LANG_POP([C++])
+
 # Check for dlopen(), needed by k_order_perturbation DLL
 AC_CHECK_LIB([dl], [dlopen], [LIBADD_DLOPEN="-ldl"], [])
 AC_SUBST([LIBADD_DLOPEN])
@@ -154,7 +156,6 @@ AC_CONFIG_FILES([Makefile
                  gensylv/Makefile
                  k_order_perturbation/Makefile
                  dynare_simul_/Makefile
-                 estimation/Makefile
                  kalman_steady_state/Makefile
                  ms_sbvar/Makefile
                  block_kalman_filter/Makefile

mex/build/matlab/estimation/Makefile.am

-include ../mex.am
-include ../../estimation.am

mex/build/matlab/mex.am

@@ -10,6 +10,8 @@ DEFS += -DMEXEXT=\"$(MEXEXT)\"
 AM_LDFLAGS = $(MATLAB_LDFLAGS)
 LIBS += $(MATLAB_LIBS)
 
+mexdir = $(libdir)/dynare/mex/matlab
+
 all-local:
 	$(MKDIR_P) $(top_srcdir)/../../matlab
 	cd $(top_srcdir)/../../matlab && \

mex/build/matlab/ms_sbvar/Makefile.am

 include ../mex.am
 include ../../ms_sbvar.am
+
+ms_sbvar_create_init_file_LDADD = -lut
+ms_sbvar_command_line_LDADD = -lut

mex/build/mjdgges.am

-noinst_PROGRAMS = mjdgges
+mex_PROGRAMS = mjdgges
 
 nodist_mjdgges_SOURCES = $(top_srcdir)/../../sources/mjdgges/mjdgges.c

mex/build/ms_sbvar.am

-noinst_PROGRAMS = ms_sbvar_create_init_file ms_sbvar_command_line
+mex_PROGRAMS = ms_sbvar_create_init_file ms_sbvar_command_line
 
 DWSWITCHDIR = $(top_srcdir)/../../../contrib/ms-sbvar/switch_dw
 DWUTILITIESDIR = $(top_srcdir)/../../../contrib/ms-sbvar/utilities_dw

mex/build/octave/Makefile.am

@@ -2,7 +2,15 @@ ACLOCAL_AMFLAGS = -I ../../../m4
 
 # libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
 if DO_SOMETHING
-SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv qzcomplex ordschur block_kalman_filter sobol local_state_space_iterations linsolve
+SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv qzcomplex block_kalman_filter sobol local_state_space_iterations
+
+if COMPILE_LINSOLVE
+SUBDIRS += linsolve
+endif
+
+if COMPILE_ORDSCHUR
+SUBDIRS += ordschur
+endif
 
 if HAVE_MATIO
 SUBDIRS += k_order_perturbation dynare_simul_
@@ -10,7 +18,7 @@ endif
 
 if HAVE_GSL
 if HAVE_MATIO
-SUBDIRS += ms_sbvar estimation
+SUBDIRS += ms_sbvar
 endif
 endif
 
@@ -18,4 +26,7 @@ if HAVE_SLICOT
 SUBDIRS += kalman_steady_state
 endif
 
+install-exec-local:
+	$(MKDIR_P) $(DESTDIR)$(pkglibdir)/mex/octave
+
 endif

mex/build/octave/configure.ac

 dnl Process this file with autoconf to produce a configure script.
 
-dnl Copyright (C) 2009-2013 Dynare Team
+dnl Copyright (C) 2009-2015 Dynare Team
 dnl
 dnl This file is part of Dynare.
 dnl
@@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.62])
-AC_INIT([dynare], [4.4-unstable])
+AC_INIT([dynare], [4.4.3])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
 
@@ -31,8 +31,15 @@ if test "x$MKOCTFILE" != "x"; then
   FFLAGS=`$MKOCTFILE -p FFLAGS`
   CXXFLAGS=`$MKOCTFILE -p CXXFLAGS`
   LDFLAGS="`$MKOCTFILE -p LFLAGS` `$MKOCTFILE -p LDFLAGS`"
+  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], [ge], [3.8], [OCTAVE38=yes])
+  AX_COMPARE_VERSION([$OCTAVE_VERSION], [ge], [4.0], [OCTAVE40=yes])
 fi
 
+AM_CONDITIONAL([COMPILE_LINSOLVE], [test "$OCTAVE38" != "yes"])
+AM_CONDITIONAL([COMPILE_ORDSCHUR], [test "$OCTAVE40" != "yes"])
+
 CFLAGS="$CFLAGS -Wall -Wno-parentheses"
 FFLAGS="$FFLAGS -Wall"
 CXXFLAGS="$CXXFLAGS -Wall -Wno-parentheses"
@@ -45,15 +52,6 @@ AX_PROG_LN_S
 AC_PROG_MKDIR_P
 AM_PROG_AR
 AX_PTHREAD
-# Check for boost libraries used in estimation DLL
-AC_LANG_PUSH([C++])
-AX_BOOST_BASE([1.36])
-CPPFLAGS_SAVED="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-AC_CHECK_HEADER([boost/random/linear_congruential.hpp], [], [AC_MSG_ERROR([Can't find Boost Random Library])])
-AC_CHECK_HEADER([boost/math/distributions/beta.hpp], [], [AC_MSG_ERROR([Can't find Boost Math Library])])
-CPPFLAGS="$CPPFLAGS_SAVED"
-AC_LANG_POP([C++])
 # Check for dlopen(), needed by k_order_perturbation DLL
 AC_CHECK_LIB([dl], [dlopen], [LIBADD_DLOPEN="-ldl"], [])
 AC_SUBST([LIBADD_DLOPEN])
@@ -110,6 +108,18 @@ else
    BUILD_MS_SBVAR_MEX_OCTAVE="no (missing GSL or MatIO library)"
 fi
 
+if test -n "$MKOCTFILE" -a "$OCTAVE38" != "yes"; then
+   BUILD_LINSOLVE_OCTAVE="yes"
+else
+   BUILD_LINSOLVE_OCTAVE="no (Octave >= 3.8)"
+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]), [
   if test "x$enable_openmp" = "xyes"; then
     CPPFLAGS="$CPPFLAGS -DUSE_OMP"
@@ -126,7 +136,9 @@ Binaries (with "make"):
  MEX files for Octave (except those listed below):                   $BUILD_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
- Estimation, k-order and dynare_simul MEX for Octave:                $BUILD_ESTIMATION_KORDER_DYNSIMUL_MEX_OCTAVE
+ k-order and dynare_simul MEX for Octave:                            $BUILD_ESTIMATION_KORDER_DYNSIMUL_MEX_OCTAVE
+ Linsolve for Octave:                                                $BUILD_LINSOLVE_OCTAVE
+ Ordschur for Octave:                                                $BUILD_ORDSCHUR_OCTAVE
 
 ])
 
@@ -138,7 +150,6 @@ AC_CONFIG_FILES([Makefile
                  gensylv/Makefile
                  k_order_perturbation/Makefile
                  dynare_simul_/Makefile
-                 estimation/Makefile
                  qzcomplex/Makefile
                  ordschur/Makefile
                  kalman_steady_state/Makefile

mex/build/octave/estimation/Makefile.am

-EXEEXT = .mex
-include ../mex.am
-include ../../estimation.am

mex/build/octave/linsolve/Makefile.am

 EXEEXT = .oct
 include ../mex.am
 
-noinst_PROGRAMS = linsolve
+mex_PROGRAMS = linsolve
 
 nodist_linsolve_SOURCES = $(top_srcdir)/../../sources/linsolve/linsolve.cc

mex/build/octave/mex.am

@@ -17,6 +17,8 @@ LIBS += $(shell $(MKOCTFILE) -p FFTW_LIBS)
 LIBS += $(shell $(MKOCTFILE) -p LIBS)
 LIBS += $(shell $(MKOCTFILE) -p FLIBS)
 
+mexdir = $(libdir)/dynare/mex/octave
+
 all-local:
 	$(MKDIR_P) $(top_srcdir)/../../octave
 	cd $(top_srcdir)/../../octave && \

mex/build/octave/ordschur/Makefile.am

 EXEEXT = .oct
 include ../mex.am
 
-noinst_PROGRAMS = ordschur
+mex_PROGRAMS = ordschur
 
 nodist_ordschur_SOURCES = $(top_srcdir)/../../sources/ordschur/ordschur.cc

mex/build/octave/qzcomplex/Makefile.am

 EXEEXT = .oct
 include ../mex.am
 
-noinst_PROGRAMS = qzcomplex
+mex_PROGRAMS = qzcomplex
 
 nodist_qzcomplex_SOURCES = $(top_srcdir)/../../sources/qzcomplex/qzcomplex.cc

mex/build/qmc_sequence.am

 vpath %.cc $(top_srcdir)/../../sources/sobol
 
-noinst_PROGRAMS = qmc_sequence
+mex_PROGRAMS = qmc_sequence
 
 nodist_qmc_sequence_SOURCES = qmc_sequence.cc

mex/sources/Makefile.am

-SUBDIRS = estimation
-
 EXTRA_DIST = \
 	dynblas.h \
 	dynlapack.h \

mex/sources/bytecode/ErrorHandling.hh

@@ -267,9 +267,6 @@ struct s_plan
 
 #ifdef MATLAB_MEX_FILE
 extern "C" bool utIsInterruptPending();
-#else
-#include <octave/oct.h>
-#include <octave/unwind-prot.h>
 #endif
 
 #ifdef _MSC_VER
@@ -575,9 +572,7 @@ public:
 
     while (go_on)
       {
-#ifdef OCTAVE_MEX_FILE
-        OCTAVE_QUIT;
-#else
+#ifdef MATLAB_MEX_FILE
 	      if ( utIsInterruptPending() )
 		      throw UserExceptionHandling();
 #endif

mex/sources/bytecode/Evaluate.cc

@@ -24,9 +24,6 @@
 
 #ifdef MATLAB_MEX_FILE
 extern "C" bool utIsInterruptPending();
-#else
-#include <octave/oct.h>
-#include <octave/unwind-prot.h>
 #endif
 
 Evaluate::Evaluate()
@@ -139,9 +136,7 @@ Evaluate::compute_block_time(const int Per_u_, const bool evaluate, /*const int
           jacob_exo_det = mxGetPr(jacobian_det_exo_block[block_num]);
         }
     }
-#ifdef OCTAVE_MEX_FILE
-  OCTAVE_QUIT;
-#else
+#ifdef MATLAB_MEX_FILE
 	if ( utIsInterruptPending() )
 		throw UserExceptionHandling();
 #endif