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

jamal jamrial at gmail.com
Wed Jul 11 04:24:05 CEST 2012


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
 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
-- 
1.7.3.4



More information about the ffmpeg-devel mailing list