stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Compatibility fix with automake 1.14" 

This reverts commit 7541bb52f5.

This commit was breaking compilation of MEX files: the subdir-objects option
does not deal well with source files that are under a distinct tree.
time-shift
Sébastien Villemot 2013-09-09 14:47:29 +02:00
parent 2e2315611c
commit d8e9bc978d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.62])
AC_INIT([dynare], [4.4-unstable])
AC_CONFIG_SRCDIR([preprocessor/DynareMain.cc])
AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability -Werror foreign no-dist-gzip dist-xz tar-pax subdir-objects])
AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability -Werror foreign no-dist-gzip dist-xz tar-pax])
AC_PROG_CC
AC_PROG_CXX

2
mex/build/matlab/configure.ac
View File

@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.62])
AC_INIT([dynare], [4.4-unstable])
AC_CONFIG_SRCDIR([configure.ac])
AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign subdir-objects])
AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
dnl The following must occur before we modify CFLAGS/CXXFLAGS
AC_CANONICAL_HOST

2
mex/build/octave/configure.ac
View File

@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.62])
AC_INIT([dynare], [4.4-unstable])
AC_CONFIG_SRCDIR([configure.ac])
AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign subdir-objects])
AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile])