On 11/03/2022 22:40, Adam Dinwoodie wrote:
The latest version of Autoconf is 2.71, but the version detection
incorrectly considers 2.70 and higher as being the same as 2.59 and
lower for the purposes of specifying documentation directories. Correct
that, and make the version detection a bit more future-proof by parsing
out the actual version parts and performing numeric comparison.
While we're at it, add a bit more commentary explaining the intent of
the different behaviour over the different Autoconf versions.
---
cygclass/autotools.cygclass | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)
diff --git a/cygclass/autotools.cygclass b/cygclass/autotools.cygclass
index cce9be0..2ab5626 100644
--- a/cygclass/autotools.cygclass
+++ b/cygclass/autotools.cygclass
@@ -619,6 +619,8 @@ cygconf() {
local confdir;
local configure;
local confver;
+ local confver_maj;
+ local confver_min;
local f;
local foo_config;
local prefix;
@@ -651,6 +653,8 @@ cygconf() {
configure="${confdir}/configure"
confver=$(grep -m 1 'GNU Autoconf' ${configure} | cut -d ' ' -f 6)
+ confver_maj=${confver%%.*}
+ confver_min=${confver##*.}
# AC_CONFIG_FILES should not be dist'ed, but it sometimes happens anyway
eval $(grep -h '^ac_config_files=' ${configure})
@@ -678,18 +682,26 @@ cygconf() {
confargs+=" --libdir=${prefix}/${MULTILIB_LIBDIR}"
fi
- case "x${confver}" in
- x2.6[0-9]*)
- confargs+=" --docdir=/usr/share/doc/${PN}
--htmldir=/usr/share/doc/${PN}/html"
- ;;
- *)
- confargs+=" --infodir=${prefix}/share/info
--mandir=${prefix}/share/man"
- ;;
- esac
+ if [ $confver_maj -ge 2 -a $confver_min -ge 60 ] || [ $confver_maj -ge
3 ]
Great. Thanks.
I think it would be acceptable to error on autoconf >=3.0, rather than
assuming it's going to be autoconf 2.6+ compatible.
