commit 16cdf70d0c4bd18eb066fee21ee7e4f35257d2f5 Author: Stephan Witt <sw...@lyx.org> Date: Fri Jul 26 13:04:32 2013 +0200
enable automake version 1.14 diff --git a/.gitignore b/.gitignore index cb56a68..3701e1e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ lyx.1 stamp-h1 *.old *.bak - +config/compile diff --git a/autogen.sh b/autogen.sh index a12f744..750d7a7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,12 +16,12 @@ test "$automake_version" != "" && { } case $automake_version in - *' '1.[8-9]*|*' '1.1[0123]*) + *' '1.[8-9]*|*' '1.1[01234]*) ;; *) echo "This automake version is not supported by LyX." - echo "LyX only supports automake 1.8 to 1.13." + echo "LyX only supports automake 1.8 to 1.14." exit 1 ;; esac diff --git a/configure.ac b/configure.ac index 33371ec..c5fc54c 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ fi AM_MAINTAINER_MODE save_PACKAGE=$PACKAGE -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8 subdir-objects]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) PACKAGE=$save_PACKAGE