allow automake >= 1.5

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18039 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/INSTALL b/INSTALL
index 70910637ea8ada4c6f6796879424b3841ea1b369..2d242c3d1d972e7a4a777aba490150fd3e1d1f4a 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -30,7 +30,7 @@ Note for Subversion checkouts
 -----------------------------
 
 If you have checked this out from Subversion, you need to have:
-* automake >= 1.9
+* automake >= 1.5
 * autoconf >= 2.52
 * gettext >= 0.12
 Then type "./autogen.sh" to build the needed configuration

diff --git a/autogen.sh b/autogen.sh
index ccb2c002dce7c82435af0bca124c95bebcc5da2f..b9b81f6d76441307c0a87eacefd64e33a0539079 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,17 +11,17 @@ automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
 test "$automake_version" != "" && {
     echo "Using $automake_version"
 } || {
-    echo "LyX requires automake >= 1.9"
+    echo "LyX requires automake >= 1.5"
     exit 1
 }
 
 case $automake_version in
-    *' '1.9*|*' '1.10*)
+    *' '1.[5-9]*|*' '1.10*)
        ;;
     *)
 
        echo "This automake version is not supported by LyX."
-       echo "LyX only supports automake 1.9 and 1.10."
+       echo "LyX only supports automake 1.5 to 1.10."
        exit 1
        ;;
 esac

diff --git a/configure.ac b/configure.ac
index 9fda6eeb06c2bcb3a8bdf654e872b68f0f40cbba..4bed38db1a41a907f4c22399204f1a06f61f3a36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ fi
 AM_MAINTAINER_MODE
 
 save_PACKAGE=$PACKAGE
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.9])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.5])
 PACKAGE=$save_PACKAGE
 
 ### Set the execute permissions of the various scripts correctly