From 17ad5fbb8af3ea3fad689064bc84ecfdfe52f0c2 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 31 Aug 2014 19:39:35 -0700 Subject: Use makeinfo to generate html doc for the new website texi2html is deprecated by upstream in favor of makeinfo/texi2any. See: - https://www.gnu.org/software/texinfo/manual/texinfo/html_node/texi2html.html - https://wiki.debian.org/Texi2htmlTransition - https://lists.debian.org/debian-devel/2013/05/msg01516.html This is actually two separate changes. Based on a patch by Andreas Cadhalpun . Fixes Trac ticket #3232. Signed-off-by: Timothy Gu --- configure | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index b1814db..c2363c9 100755 --- a/configure +++ b/configure @@ -1802,6 +1802,7 @@ HAVE_LIST=" libdc1394_1 libdc1394_2 makeinfo + makeinfo_html perl pod2man sdl @@ -2631,7 +2632,8 @@ ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer" # documentation podpages_deps="perl" manpages_deps="perl pod2man" -htmlpages_deps="perl texi2html" +htmlpages_deps="perl" +htmlpages_deps_any="makeinfo_html texi2html" txtpages_deps="perl makeinfo" doc_deps_any="manpages htmlpages podpages txtpages" @@ -4916,8 +4918,11 @@ else fi enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs -texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo +enabled makeinfo && (makeinfo --version | \ + grep -q 'makeinfo (GNU texinfo) 5' > /dev/null 2>&1) \ + && 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 pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout @@ -5401,6 +5406,7 @@ echo "texi2html enabled ${texi2html-no}" echo "perl enabled ${perl-no}" echo "pod2man enabled ${pod2man-no}" echo "makeinfo enabled ${makeinfo-no}" +echo "makeinfo supports HTML ${makeinfo_html-no}" test -n "$random_seed" && echo "random seed ${random_seed}" echo -- cgit v1.1