From 73e7fe8e648a9d666338691fd30c6c080ee808b1 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Sat, 13 Jun 2015 20:24:27 +0200 Subject: [PATCH] configure: make makeinfo_html check more robust The current check is too strict for newer makeinfo versions. Existing version strings are: makeinfo (GNU texinfo) 4.13 makeinfo (GNU texinfo) 5.2 texi2any (GNU texinfo) 5.9.93 Probably version 6 will come in the not too far future. Reviewed-by: Timothy Gu Signed-off-by: Andreas Cadhalpun (cherry picked from commit 72654526e4489c0aac05d25cfeca5bbba26026b3) Signed-off-by: Andreas Cadhalpun --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 06a9941695..3960b735c1 100755 --- a/configure +++ b/configure @@ -5239,8 +5239,8 @@ disabled securetransport || { check_func SecIdentityCreate "-Wl,-framework,CoreF enable securetransport; } makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo -enabled makeinfo && (makeinfo --version | \ - grep -q 'makeinfo (GNU texinfo) 5' > /dev/null 2>&1) \ +enabled makeinfo \ + && [ 0$(makeinfo --version | grep "texinfo" | sed 's/.*texinfo[^0-9]*\([0-9]*\)\..*/\1/') -ge 5 ] \ && enable makeinfo_html || disable makeinfo_html disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html perl -v > /dev/null 2>&1 && enable perl || disable perl