From: Stephan Witt <switt@lyx.org>
Date: Fri, 26 Jul 2013 11:04:32 +0000 (+0200)
Subject: enable automake version 1.14
X-Git-Tag: 2.1.0beta2~204
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=16cdf70d0c4bd18eb066fee21ee7e4f35257d2f5;p=lyx.git

enable automake version 1.14
---

diff --git a/.gitignore b/.gitignore
index cb56a68255..3701e1eef2 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 a12f744542..750d7a7bc5 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 33371ecc05..c5fc54cddb 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