Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Dynare
dynare
Commits
41bda1eb
Commit
41bda1eb
authored
Dec 13, 2010
by
Houtan Bastani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mac libslicot compilation optional (because a Fortran compiler is not standard on OS X)
parent
1329b57f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
2 deletions
+26
-2
mex/build/matlab/Makefile.am
mex/build/matlab/Makefile.am
+6
-1
mex/build/matlab/configure.ac
mex/build/matlab/configure.ac
+8
-0
mex/build/octave/Makefile.am
mex/build/octave/Makefile.am
+4
-1
mex/build/octave/configure.ac
mex/build/octave/configure.ac
+8
-0
No files found.
mex/build/matlab/Makefile.am
View file @
41bda1eb
...
@@ -3,7 +3,12 @@ ACLOCAL_AMFLAGS = -I ../../../m4
...
@@ -3,7 +3,12 @@ ACLOCAL_AMFLAGS = -I ../../../m4
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
# libslicot must come before kalman_steady_state
# libslicot must come before kalman_steady_state
if
DO_SOMETHING
if
DO_SOMETHING
SUBDIRS
=
mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ logposterior logMHMCMCposterior libslicot kalman_steady_state
SUBDIRS
=
mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ logposterior logMHMCMCposterior kalman_steady_state
if
HAVE_FORT
SUBDIRS
+=
libslicot
endif
if
HAVE_GSL
if
HAVE_GSL
SUBDIRS
+=
swz
SUBDIRS
+=
swz
endif
endif
...
...
mex/build/matlab/configure.ac
View file @
41bda1eb
...
@@ -54,6 +54,7 @@ FFLAGS="$FFLAGS -Wall"
...
@@ -54,6 +54,7 @@ FFLAGS="$FFLAGS -Wall"
CXXFLAGS="$CXXFLAGS -Wall"
CXXFLAGS="$CXXFLAGS -Wall"
AC_PROG_F77
AC_PROG_F77
AM_CONDITIONAL([HAVE_FORT], [test "x$F77" != "x"])
AC_PROG_CC
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CXX
AC_PROG_RANLIB
AC_PROG_RANLIB
...
@@ -94,6 +95,12 @@ else
...
@@ -94,6 +95,12 @@ else
BUILD_SWZ_MEX_MATLAB="no (missing GSL)"
BUILD_SWZ_MEX_MATLAB="no (missing GSL)"
fi
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"
else
BUILD_LIBSLICOT_MATLAB="no (missing Fortran Compiler)"
fi
AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [
AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [
if test "x$enable_openmp" = "xyes"; then
if test "x$enable_openmp" = "xyes"; then
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
...
@@ -118,6 +125,7 @@ Dynare is now configured for building the following components...
...
@@ -118,6 +125,7 @@ Dynare is now configured for building the following components...
Binaries (with "make"):
Binaries (with "make"):
MEX files for MATLAB (except SWZ): $BUILD_MEX_MATLAB
MEX files for MATLAB (except SWZ): $BUILD_MEX_MATLAB
Libslicot library: $BUILD_LIBSLICOT_MATLAB
SWZ MEX files for MATLAB: $BUILD_SWZ_MEX_MATLAB
SWZ MEX files for MATLAB: $BUILD_SWZ_MEX_MATLAB
M2HTML documentation: $BUILD_M2HTML
M2HTML documentation: $BUILD_M2HTML
...
...
mex/build/octave/Makefile.am
View file @
41bda1eb
...
@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I ../../../m4
...
@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I ../../../m4
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
if
DO_SOMETHING
if
DO_SOMETHING
SUBDIRS
=
mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ qzcomplex ordschur libslicot kalman_steady_state
SUBDIRS
=
mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ qzcomplex ordschur kalman_steady_state
if
HAVE_FORT
SUBDIRS
+=
libslicot
endif
if
HAVE_GSL
if
HAVE_GSL
SUBDIRS
+=
swz
SUBDIRS
+=
swz
endif
endif
...
...
mex/build/octave/configure.ac
View file @
41bda1eb
...
@@ -37,6 +37,7 @@ FFLAGS="$FFLAGS -Wall"
...
@@ -37,6 +37,7 @@ FFLAGS="$FFLAGS -Wall"
CXXFLAGS="$CXXFLAGS -Wall"
CXXFLAGS="$CXXFLAGS -Wall"
AC_PROG_F77
AC_PROG_F77
AM_CONDITIONAL([HAVE_FORT], [test "x$F77" != "x"])
AC_PROG_CC
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CXX
AC_PROG_RANLIB
AC_PROG_RANLIB
...
@@ -89,6 +90,12 @@ else
...
@@ -89,6 +90,12 @@ else
BUILD_ESTIMATION_MEX_OCTAVE="no (missing MatIO library)"
BUILD_ESTIMATION_MEX_OCTAVE="no (missing MatIO library)"
fi
fi
if test "x$MKOCTFILE" != "x" -a "x$F77" != "x"; then
BUILD_LIBSLICOT_OCTAVE="yes"
else
BUILD_LIBSLICOT_OCTAVE="no (missing Fortran Compiler)"
fi
AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [
AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [
if test "x$enable_openmp" = "xyes"; then
if test "x$enable_openmp" = "xyes"; then
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
...
@@ -103,6 +110,7 @@ Dynare is now configured for building the following components...
...
@@ -103,6 +110,7 @@ Dynare is now configured for building the following components...
Binaries (with "make"):
Binaries (with "make"):
MEX files for Octave (except SWZ): $BUILD_MEX_OCTAVE
MEX files for Octave (except SWZ): $BUILD_MEX_OCTAVE
Libslicot library: $BUILD_LIBSLICOT_OCTAVE
SWZ MEX files for Octave: $BUILD_SWZ_MEX_OCTAVE
SWZ MEX files for Octave: $BUILD_SWZ_MEX_OCTAVE
Estimation MEX for Octave: $BUILD_ESTIMATION_MEX_OCTAVE
Estimation MEX for Octave: $BUILD_ESTIMATION_MEX_OCTAVE
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment