mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-24 13:48:59 +00:00
Do not error out with too new autoconf/automake
The tests are not useful, since the configure.ac file checks for
minimal version anyway.
(cherry picked from commit 510b2cfd64
)
This commit is contained in:
parent
5969f0e7d1
commit
29f2a7ed66
22
autogen.sh
22
autogen.sh
@ -15,16 +15,6 @@ test "$automake_version" != "" && {
|
||||
exit 1
|
||||
}
|
||||
|
||||
case $automake_version in
|
||||
*' '1.1[456]*)
|
||||
;;
|
||||
*)
|
||||
echo "This automake version is not supported by LyX."
|
||||
echo "LyX only supports automake 1.14 through 1.16."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Discover what version of autoconf we are using.
|
||||
autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
|
||||
|
||||
@ -35,18 +25,6 @@ test "$autoversion" != "" && {
|
||||
exit 1
|
||||
}
|
||||
|
||||
case $autoversion in
|
||||
*' '2.6[5-9])
|
||||
;;
|
||||
*' '2.71)
|
||||
;;
|
||||
*)
|
||||
echo "This autoconf version is not supported by LyX."
|
||||
echo "LyX only supports autoconf 2.65-2.69, 2.71."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Delete old cache directories.
|
||||
# automake will stop if their contents was created by an earlier version.
|
||||
rm -rf autom4te.cache
|
||||
|
@ -103,3 +103,5 @@ What's new
|
||||
|
||||
- fix warning when configuring with Qt 5.15.1x.
|
||||
|
||||
- do not halt compilation because of a too new autoconf or automake version
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user