[LyX/2.3.x] Do not error out with too new autoconf/automake
Jean-Marc Lasgouttes
lasgouttes at lyx.org
Mon Feb 5 20:53:56 UTC 2024
commit 29f2a7ed66c3eddbd1697556aa375ed2263fdf26
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date: Fri Feb 2 08:34:51 2024 +0100
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 510b2cfd64b1bca443ba3f4756b1bae0610e98fd)
---
autogen.sh | 22 ----------------------
status.23x | 2 ++
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 52ca5ca..886d54f 100755
--- a/autogen.sh
+++ b/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
diff --git a/status.23x b/status.23x
index 2281bea..18f5029 100644
--- a/status.23x
+++ b/status.23x
@@ -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
+
More information about the lyx-cvs
mailing list