Compatibility fix with automake 1.14

7541bb52 · Sébastien Villemot · 4ce2c364 · 7541bb52 · 7541bb52 · 7541bb52
Commit 7541bb52 authored Sep 06, 2013 by Sébastien Villemot
--- a/configure.ac
+++ b/configure.ac
@@ -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])
+AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability -Werror foreign no-dist-gzip dist-xz tar-pax subdir-objects])

 AC_PROG_CC
 AC_PROG_CXX

--- a/mex/build/matlab/configure.ac
+++ b/mex/build/matlab/configure.ac
@@ -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])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign subdir-objects])

 dnl The following must occur before we modify CFLAGS/CXXFLAGS
 AC_CANONICAL_HOST

--- a/mex/build/octave/configure.ac
+++ b/mex/build/octave/configure.ac
@@ -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])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign subdir-objects])

 AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile])