enable automake version 1.14

diff --git a/.gitignore b/.gitignore
index cb56a682553c2bb6ebca60ff5ab3024377c3f6bf..3701e1eef2c8a101c438006ab464fe18738b3dfa 100644 (file)
--- 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 a12f744542194c460b55f49b9930e71a5c2210fd..750d7a7bc590057c1c66cc776786476cbc978982 100755 (executable)
--- 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 33371ecc052339adf3c9eaafa83aaafd877bc898..c5fc54cddb1c5352ac691f37fc70dcfe73ec0866 100644 (file)
--- 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