fix #6352 and do some additional cleanup

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@32220 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2009-11-27 13:43:40 +00:00
parent dc885f17f3
commit 24889a8888
3 changed files with 9 additions and 7 deletions

View File

@ -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.5"
echo "LyX requires automake >= 1.8"
exit 1
}
case $automake_version in
*' '1.[5-9]*|*' '1.1[01]*)
*' '1.[8-9]*|*' '1.1[01]*)
;;
*)
echo "This automake version is not supported by LyX."
echo "LyX only supports automake 1.5 to 1.11."
echo "LyX only supports automake 1.8 to 1.11."
exit 1
;;
esac
@ -38,11 +38,11 @@ test "$autoversion" != "" && {
case $autoversion in
*' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-3])
*' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-4])
;;
*)
echo "This autoconf version is not supported by LyX."
echo "LyX only supports autoconf 2.59c-2.63."
echo "LyX only supports autoconf 2.59c-2.64."
exit 1
;;
esac

View File

@ -29,7 +29,7 @@ AC_ARG_ENABLE(build-type,
build_type=prerelease;;
esac])
AC_MSG_RESULT([$build_type])
if test $lyx_devel_version == yes ; then
if test $lyx_devel_version = yes ; then
AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
LYX_DATE="not released yet"
fi

View File

@ -344,7 +344,9 @@ What's new
LyX builds with gcc 4.4 without the need to use --without-included-boost.
- Clarify that we require automake 1.8 (this was already the case, but
nobody noticed).
nobody noticed). Accept autoconf 2.64 (bug 6352).
- Fix buglet in configure script with recent bash versions.
- The script ext_copy.py can now also copy files in subdirectories.
(useful for external converters)