Bring the old automake deps back and wait some more time.

For future reference, in this patch dep for autoconf 2.60 was missing.

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg159235.html

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

diff --git a/INSTALL b/INSTALL
index 4eb646d74353123f99e4e6c16a2dd63d867a222d..98b4b13868466dab8f15c0618e5928af7f7d6e6a 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -31,7 +31,7 @@ Note for Subversion (SVN) checkouts
 -----------------------------
 
 If you have checked this out from Subversion, you need to have:
-* automake >= 1.10.1
+* automake >= 1.8
 * autoconf >= 2.59c
 * gettext >= 0.12
 Then type "./autogen.sh" to build the needed configuration

diff --git a/autogen.sh b/autogen.sh
index f8e1f5ce7305ae9ebedcfa08875067e1d5ff1f84..da8b6aa655b94b22d1c2771e692ec4bf36c9b023 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,12 +16,12 @@ test "$automake_version" != "" && {
 }
 
 case $automake_version in
-    *' '1.10.*|*' '1.11*)
+    *' '1.[8-9]*|*' '1.1[01]*)
        ;;
     *)
 
        echo "This automake version is not supported by LyX."
-       echo "LyX only supports automake 1.10.1 to 1.11."
+       echo "LyX only supports automake 1.8 to 1.11."
        exit 1
        ;;
 esac

diff --git a/configure.ac b/configure.ac
index 4d47390beaeac0347f1328a1d8c79199260a3725..565dd89ff56a0b3b343333112b084b2ae0f6c9b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ fi
 AM_MAINTAINER_MODE
 
 save_PACKAGE=$PACKAGE
-AM_INIT_AUTOMAKE([foreign dist-lzma no-define 1.10])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 PACKAGE=$save_PACKAGE