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

Michael Niedermayer michaelni at gmx.at
Wed Jul 11 14:29:01 CEST 2012


On Wed, Jul 11, 2012 at 02:13:33PM +0200, 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.
> 
> >  makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
> >  pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
> >  
> > diff --git a/doc/Makefile b/doc/Makefile
> > index 16f6a0d..1bed959 100644
> > --- a/doc/Makefile
> > +++ b/doc/Makefile
> > @@ -13,7 +13,10 @@ HTMLPAGES   = $(PROGS-yes:%=doc/%.html)                                 \
> >  TXTPAGES    = doc/fate.txt                                              \
> >  
> >  
> > -DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
> > +DOCS = $(MANPAGES) $(PODPAGES)
> > +ifdef HAVE_TEXI2HTML
> > +DOCS += $(HTMLPAGES)
> > +endif
> >  ifdef HAVE_MAKEINFO
> >  DOCS += $(TXTPAGES)
> >  endif
> 
> I suggest (possibly in a separate patch):
> DOCS =
> ifdef HAVE_MAKEINFO
> DOCS += $(TXTPAGES)
> endif
> ifdef HAVE_POD2MAN
> DOCS += $(MANPAGES)
> endif
> ifdef HAVE_TEXI2HTML
> DOCS += $(HTMLPAGES)
> endif

simpler and more consistemt to the rest of our makefiles

DOCS-$(HAVE_MAKEINFO)   += $(TXTPAGES)
DOCS-$(HAVE_POD2MAN )   += $(MANPAGES)
DOCS-$(HAVE_TEXI2HTML)  += $(HTMLPAGES)
DOCS += $(DOCS-yes)

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many things microsoft did are stupid, but not doing something just because
microsoft did it is even more stupid. If everything ms did were stupid they
would be bankrupt already.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120711/8f66b2d6/attachment.asc>


More information about the ffmpeg-devel mailing list