From ad28c2054d0fe6259dc10c588306adea36a0f9b9 Mon Sep 17 00:00:00 2001 From: Houtan Bastani <houtanb@gmail.com> Date: Fri, 25 Jun 2010 12:25:27 +0200 Subject: [PATCH] Add boost/math and boost/random to configure script for mex build system --- mex/build/loglikelihood.am | 3 ++- mex/build/matlab/configure.ac | 9 +++++++++ mex/build/octave/configure.ac | 11 ++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mex/build/loglikelihood.am b/mex/build/loglikelihood.am index 4664b4bf2..7c97bf104 100644 --- a/mex/build/loglikelihood.am +++ b/mex/build/loglikelihood.am @@ -1,7 +1,8 @@ vpath %.cc $(top_srcdir)/../../sources/estimation $(top_srcdir)/../../sources/estimation/libmat $(top_srcdir)/../../sources/estimation/utils vpath %.hh $(top_srcdir)/../../sources/estimation $(top_srcdir)/../../sources/estimation/libmat -CPPFLAGS += -I$(top_srcdir)/../../sources/estimation/libmat -I$(top_srcdir)/../../sources/estimation/utils +CPPFLAGS += -I$(top_srcdir)/../../sources/estimation/libmat -I$(top_srcdir)/../../sources/estimation/utils $(BOOST_CPPFLAGS) +LDFLAGS += $(BOOST_LDFLAGS) noinst_PROGRAMS = loglikelihood diff --git a/mex/build/matlab/configure.ac b/mex/build/matlab/configure.ac index e39f90c56..e4bea1f1e 100644 --- a/mex/build/matlab/configure.ac +++ b/mex/build/matlab/configure.ac @@ -59,6 +59,15 @@ AC_PROG_RANLIB AX_PROG_LN_S AC_PROG_MKDIR_P AX_PTHREAD +# Check for boost libraries used in estimation DLL +AC_LANG_PUSH([C++]) +AX_BOOST_BASE([1.34]) +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]) diff --git a/mex/build/octave/configure.ac b/mex/build/octave/configure.ac index 626ea6eda..a7826460a 100644 --- a/mex/build/octave/configure.ac +++ b/mex/build/octave/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl Copyright (C) 2009 Dynare Team +dnl Copyright (C) 2009-2010 Dynare Team dnl dnl This file is part of Dynare. dnl @@ -40,6 +40,15 @@ AC_PROG_RANLIB AX_PROG_LN_S AC_PROG_MKDIR_P AX_PTHREAD +# Check for boost libraries used in estimation DLL +AC_LANG_PUSH([C++]) +AX_BOOST_BASE([1.34]) +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]) -- GitLab