Build system:
* added flags "--disable-matlab" and "--disable-octave" to top-level configure script, to manually disable building of MEX files for MATLAB / Octave * incorporated new conditional variance decomposition test to testsuite git-svn-id: https://www.dynare.org/svn/dynare/trunk@3115 ac1d8469-bf42-47a9-8791-bf33cf982152time-shift
parent
e5f31e4ed3
commit
63d4fe0910
|
@ -7,7 +7,12 @@ endif
|
|||
endif
|
||||
|
||||
# MEX must be built after dynare++ (because of kordepert)
|
||||
SUBDIRS += mex/build/octave mex/build/matlab
|
||||
if ENABLE_MATLAB
|
||||
SUBDIRS += mex/build/matlab
|
||||
endif
|
||||
if ENABLE_OCTAVE
|
||||
SUBDIRS += mex/build/octave
|
||||
endif
|
||||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
|
|
12
configure.ac
12
configure.ac
|
@ -159,7 +159,17 @@ AC_CONFIG_FILES([Makefile
|
|||
dynare++/src/Makefile
|
||||
])
|
||||
|
||||
AC_CONFIG_SUBDIRS([mex/build/matlab mex/build/octave])
|
||||
AC_ARG_ENABLE([matlab], AS_HELP_STRING([--disable-matlab], [disable compilation of MEX files for MATLAB]), [], [enable_matlab=yes])
|
||||
if test "x$enable_matlab" = "xyes"; then
|
||||
AC_CONFIG_SUBDIRS([mex/build/matlab])
|
||||
fi
|
||||
AM_CONDITIONAL([ENABLE_MATLAB], [test "x$enable_matlab" = "xyes"])
|
||||
|
||||
AC_ARG_ENABLE([octave], AS_HELP_STRING([--disable-octave], [disable compilation of MEX files for Octave]), [], [enable_octave=yes])
|
||||
if test "x$enable_octave" = "xyes"; then
|
||||
AC_CONFIG_SUBDIRS([mex/build/octave])
|
||||
fi
|
||||
AM_CONDITIONAL([ENABLE_OCTAVE], [test "x$enable_octave" = "xyes"])
|
||||
|
||||
# Construct final output message
|
||||
|
||||
|
|
|
@ -22,7 +22,8 @@ OCTAVE_MODS = \
|
|||
AIM/fs2000x10L9_L.mod \
|
||||
AIM/fs2000x10L9_L_AIM.mod \
|
||||
AIM/fs2000x10_L9_L.mod \
|
||||
AIM/fs2000x10_L9_L_AIM.mod
|
||||
AIM/fs2000x10_L9_L_AIM.mod \
|
||||
conditional_variance_decomposition/example1.mod
|
||||
|
||||
MODS = $(OCTAVE_MODS) \
|
||||
arima/mod1b.mod \
|
||||
|
|
Loading…
Reference in New Issue