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
This commit is contained in:
Pavel Sanda 2010-04-07 10:59:57 +00:00
parent 6b0683d8e9
commit 20d528aa98
3 changed files with 4 additions and 4 deletions

View File

@ -31,7 +31,7 @@ Note for Subversion (SVN) checkouts
----------------------------- -----------------------------
If you have checked this out from Subversion, you need to have: If you have checked this out from Subversion, you need to have:
* automake >= 1.10.1 * automake >= 1.8
* autoconf >= 2.59c * autoconf >= 2.59c
* gettext >= 0.12 * gettext >= 0.12
Then type "./autogen.sh" to build the needed configuration Then type "./autogen.sh" to build the needed configuration

View File

@ -16,12 +16,12 @@ test "$automake_version" != "" && {
} }
case $automake_version in case $automake_version in
*' '1.10.*|*' '1.11*) *' '1.[8-9]*|*' '1.1[01]*)
;; ;;
*) *)
echo "This automake version is not supported by LyX." 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 exit 1
;; ;;
esac esac

View File

@ -26,7 +26,7 @@ fi
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
save_PACKAGE=$PACKAGE 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])]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
PACKAGE=$save_PACKAGE PACKAGE=$save_PACKAGE