Commit 41bda1eb authored by Houtan Bastani's avatar Houtan Bastani

Mac libslicot compilation optional (because a Fortran compiler is not standard on OS X)

parent 1329b57f
......@@ -3,7 +3,12 @@ ACLOCAL_AMFLAGS = -I ../../../m4
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
# libslicot must come before kalman_steady_state
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
SUBDIRS += swz
endif
......
......@@ -54,6 +54,7 @@ FFLAGS="$FFLAGS -Wall"
CXXFLAGS="$CXXFLAGS -Wall"
AC_PROG_F77
AM_CONDITIONAL([HAVE_FORT], [test "x$F77" != "x"])
AC_PROG_CC
AC_PROG_CXX
AC_PROG_RANLIB
......@@ -94,6 +95,12 @@ else
BUILD_SWZ_MEX_MATLAB="no (missing GSL)"
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]), [
if test "x$enable_openmp" = "xyes"; then
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
......@@ -118,6 +125,7 @@ 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
......
......@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I ../../../m4
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
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
SUBDIRS += swz
endif
......
......@@ -37,6 +37,7 @@ FFLAGS="$FFLAGS -Wall"
CXXFLAGS="$CXXFLAGS -Wall"
AC_PROG_F77
AM_CONDITIONAL([HAVE_FORT], [test "x$F77" != "x"])
AC_PROG_CC
AC_PROG_CXX
AC_PROG_RANLIB
......@@ -89,6 +90,12 @@ else
BUILD_ESTIMATION_MEX_OCTAVE="no (missing MatIO library)"
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]), [
if test "x$enable_openmp" = "xyes"; then
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
......@@ -103,6 +110,7 @@ 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
......
Markdown is supported
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