Skip to content
Snippets Groups Projects
Commit d8e9bc97 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Revert "Compatibility fix with automake 1.14"

This reverts commit 7541bb52.

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.
parent 2e231561
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>. ...@@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.62]) AC_PREREQ([2.62])
AC_INIT([dynare], [4.4-unstable]) AC_INIT([dynare], [4.4-unstable])
AC_CONFIG_SRCDIR([preprocessor/DynareMain.cc]) 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_CC
AC_PROG_CXX AC_PROG_CXX
......
...@@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>. ...@@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.62]) AC_PREREQ([2.62])
AC_INIT([dynare], [4.4-unstable]) AC_INIT([dynare], [4.4-unstable])
AC_CONFIG_SRCDIR([configure.ac]) 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 dnl The following must occur before we modify CFLAGS/CXXFLAGS
AC_CANONICAL_HOST AC_CANONICAL_HOST
......
...@@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>. ...@@ -20,7 +20,7 @@ dnl along with Dynare. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.62]) AC_PREREQ([2.62])
AC_INIT([dynare], [4.4-unstable]) AC_INIT([dynare], [4.4-unstable])
AC_CONFIG_SRCDIR([configure.ac]) 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]) AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment