1. ffmpeg
  2. Commit 73e7fe8e648a9d666338691fd30c6c080ee808b1
Browse code

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 <timothygu99@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 72654526e4489c0aac05d25cfeca5bbba26026b3)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Andreas Cadhalpun authored on 2015/06/14 03:24:27
Showing 1 changed files
configure
History View file @ 73e7fe8
... ... 
@@ -5239,8 +5239,8 @@ disabled securetransport || { check_func SecIdentityCreate "-Wl,-framework,CoreF
5239 5239 
     enable securetransport; }
5240 5240
5241 5241 
 makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
5242 
-enabled makeinfo && (makeinfo --version | \
5243 
-                     grep -q 'makeinfo (GNU texinfo) 5' > /dev/null 2>&1) \
5242 
+enabled makeinfo \
5243 
+    && [ 0$(makeinfo --version | grep "texinfo" | sed 's/.*texinfo[^0-9]*\([0-9]*\)\..*/\1/') -ge 5 ] \
5244 5244 
     && enable makeinfo_html || disable makeinfo_html
5245 5245 
 disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
5246 5246 
 perl -v            > /dev/null 2>&1 && enable perl      || disable perl