[FFmpeg-devel] [PATCH 2/3] configure: Check that texi2html supports --init-file

Stefano Sabatini stefasab at gmail.com
Thu Jul 12 01:20:26 CEST 2012


On date Wednesday 2012-07-11 15:51:30 -0300, jamal encoded:
> On 11/07/12 9:13 AM, Stefano Sabatini wrote:
> > On date Tuesday 2012-07-10 23:24:05 -0300, jamal encoded:
> >> Don't build html pages if it's disabled.
> >> ---
> >>  configure    |    3 ++-
> >>  doc/Makefile |    5 ++++-
> >>  2 files changed, 6 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/configure b/configure
> >> index 2f9d9a3..0e08a4d 100755
> >> --- a/configure
> >> +++ b/configure
> >> @@ -1293,6 +1293,7 @@ HAVE_LIST="
> >>      sys_time_h
> >>      sys_videoio_h
> >>      termios_h
> >> +    texi2html
> >>      threads
> >>      trunc
> >>      truncf
> >> @@ -3374,7 +3375,7 @@ else
> >>  fi
> >>  enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
> >>  
> >> -texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
> >> +test $(texi2html -version) \> "1.67" && enable texi2html || disable texi2html
> > Test should be sane. Alternatively we could check explicitely
> > texi2html -init-file, in case texi2html decides to change syntax for
> > the -version output.

> How about
> 
> texi2html --help 2>&1 | grep -q 'init-file' && enable texi2html || disable texi2html

Works for me if it works for you (but I don't mind the version check,
whatever is a good compromise of safe/simple).
-- 
FFmpeg = Furious and Fierce Mythic Portentous Enlightening God


More information about the ffmpeg-devel mailing list