diff --git a/README.md b/README.md index 3d5897319420f89c69576b5480b895275d0cd083..15beba9c836ac803dfe2d25559e987b7c541d002 100644 --- a/README.md +++ b/README.md @@ -69,16 +69,13 @@ A number of tools and libraries are needed in order to recompile everything. You - [Flex](http://flex.sourceforge.net/), version 2.5.4 or later (only if you get the source through Git) - [Autoconf](http://www.gnu.org/software/autoconf/), version 2.62 or later (only if you get the source through Git) (see [Installing an updated version of Autoconf in your own directory, in GNU/Linux](http://www.dynare.org/DynareWiki/AutoMake)) - [Automake](http://www.gnu.org/software/automake/), version 1.11.2 or later (only if you get the source through Git) (see [Installing an updated version of AutoMake in your own directory, in GNU/Linux](http://www.dynare.org/DynareWiki/AutoMake)) -- [CWEB](http://www-cs-faculty.stanford.edu/%7Eknuth/cweb.html), with its tools - `ctangle` and `cweave` (only if you want to build the k-order DLL or Dynare++, and get the source through Git) - An implementation of BLAS and LAPACK: either [ATLAS](http://math-atlas.sourceforge.net/), [OpenBLAS](http://xianyi.github.com/OpenBLAS/), Netlib ([BLAS](http://www.netlib.org/blas/), [LAPACK](http://www.netlib.org/lapack/)) or [MKL](http://software.intel.com/en-us/intel-mkl/) (only if you want to build Dynare++) - An implementation of [POSIX Threads](http://en.wikipedia.org/wiki/POSIX_Threads) (optional, for taking advantage of multi-core) - [MAT File I/O library](http://sourceforge.net/projects/matio/) (if you want to compile Markov-Switching code, the estimation DLL, k-order DLL and Dynare++) - [SLICOT](http://www.slicot.org) (if you want to compile the Kalman steady state DLL) - [GSL library](http://www.gnu.org/software/gsl/) (if you want to compile Markov-Switching code) -- A decent LaTeX distribution (if you want to compile PDF documentation). The following extra components may be needed: - - [Eplain](http://www.tug.org/eplain/) TeX macros (only if you want to build Dynare++ source documentation) - - [Beamer](http://latex-beamer.sourceforge.net/) (for some PDF presentations) +- A decent LaTeX distribution (if you want to compile PDF documentation), + ideally with Beamer - For building the reference manual: - [GNU Texinfo](http://www.gnu.org/software/texinfo/) - [Latex2HTML](http://www.latex2html.org), if you want nice mathematical formulas in HTML output @@ -216,8 +213,6 @@ All the prerequisites are packaged: - `automake` - `texlive` - `texlive-publishers` (for Econometrica bibliographic style) -- `texlive-extra-utils` (for CWEB) -- `texlive-formats-extra` (for Eplain) - `texlive-latex-extra` (for fullpage.sty) - `texlive-fonts-extra` (for ccicons) - `texlive-latex-recommended` @@ -247,18 +242,6 @@ pacman -Syu ``` pacman -S git autoconf automake-wrapper bison flex make tar texinfo mingw-w64-x86_64-gcc mingw-w64-x86_64-gcc-fortran mingw-w64-x86_64-boost mingw-w64-x86_64-gsl mingw-w64-x86_64-matio mingw-w64-x86_64-openblas ``` -- **(Optional)** compile and install `ctangle`, needed for the k-order MEX file and for - Dynare++ (*i.e.* if you want to solve models at order ≥ 3) -``` -wget ftp://ftp.cs.stanford.edu/pub/cweb/cweb.tar.gz -mkdir cweb -cd cweb -tar xf ../cweb.tar.gz -make ctangle -mkdir -p /usr/local/bin -cp ctangle.exe /usr/local/bin/ -cd .. -``` - **(Optional)** compile and install SLICOT, needed for the `kalman_steady_state` MEX file ``` @@ -328,8 +311,6 @@ compile. They should be entered at the command prompt in Terminal.app. - **(Optional)** To compile Dynare mex files for use on Octave: - `brew install octave` - `brew install suite-sparse` -- **(Optional)** To compile Dynare++ - - `brew install cweb` - **(Optional)** To compile Dynare documentation - Install the latest version of [MacTeX](http://www.tug.org/mactex/), deselecting the option to install Ghostscript - `brew install doxygen latex2html` diff --git a/configure.ac b/configure.ac index f3a8f7e37868c08d65079d4db84086b03b9eb5a1..298f3779f5939e0106fc9bf873728e6fff44ed3b 100644 --- a/configure.ac +++ b/configure.ac @@ -84,21 +84,9 @@ AM_CONDITIONAL([HAVE_MATIO], [test "x$has_matio" = "xyes"]) AC_CHECK_PROG([MAKEINFO], [makeinfo], [makeinfo]) -AC_CHECK_PROG([PDFTEX], [pdftex], [pdftex]) -AM_CONDITIONAL([HAVE_PDFTEX], [test "x$PDFTEX" != "x"]) - AC_CHECK_PROG([PDFETEX], [pdfetex], [pdfetex]) AM_CONDITIONAL([HAVE_PDFETEX], [test "x$PDFETEX" != "x"]) -if test "x$PDFTEX" != "x"; then - AC_MSG_CHECKING([for eplain]) - AX_TEX_TEST([\input eplain -\end -], [ax_tex_have_eplain]) - AC_MSG_RESULT([$ax_tex_have_eplain]) -fi -AM_CONDITIONAL([HAVE_EPLAIN], [test "x$ax_tex_have_eplain" = "xyes"]) - AC_CHECK_PROG([PDFLATEX], [pdflatex], [pdflatex]) AM_CONDITIONAL([HAVE_PDFLATEX], [test "x$PDFLATEX" != "x"]) @@ -113,16 +101,6 @@ if test "x$PDFLATEX" != "x" -a "x$BIBTEX" != "x"; then fi AM_CONDITIONAL([HAVE_BEAMER], [test "x$ax_latex_have_beamer" = "xyes"]) -AC_CHECK_PROG([CTANGLE], [ctangle], [ctangle]) -AM_CONDITIONAL([HAVE_CTANGLE], [test "x$CTANGLE" != "x"]) -if test "x$CTANGLE" = "x"; then - unset CTANGLE # AM_MISSING_PROG needs an unset variable: an empty variable won't do - AM_MISSING_PROG([CTANGLE], [ctangle]) -fi - -AC_CHECK_PROG([CWEAVE], [cweave], [cweave]) -AM_CONDITIONAL([HAVE_CWEAVE], [test "x$CWEAVE" != "x"]) - AC_PROG_F77 AC_F77_LIBRARY_LDFLAGS case ${host_os} in @@ -211,12 +189,6 @@ else BUILD_DYNAREPLUSPLUS="no (missing one of: BLAS, LAPACK, MatIO)" fi -if test "x$CWEAVE" != "x" -a x"$PDFTEX" != "x" -a "x$ax_tex_have_eplain" = "xyes"; then - BUILD_DYNAREPLUSPLUS_SRCDOC="yes" -else - BUILD_DYNAREPLUSPLUS_SRCDOC="no (missing one of: cweave, pdftex, eplain)" -fi - if test "x$PDFLATEX" != "x" -a "x$ax_latex_have_beamer" = "xyes"; then BUILD_BEAMER_DOC="yes" else @@ -270,7 +242,6 @@ Binaries (with "make"): PDF documentation (with "make pdf"): Dynare reference manual: $BUILD_DYNARE_PDF_MANUAL - Dynare++ developer documentation: $BUILD_DYNAREPLUSPLUS_SRCDOC Beamer presentations: $BUILD_BEAMER_DOC Various other documents: $BUILD_OTHER_PDF_DOC