[FFmpeg-devel] [PATCH] configure: Clean up the documentation building mechanism

[Stefano Sabatini]

On date Tuesday 2012-12-18 04:05:36 -0300, jamal encoded:
> Hello.
> 
> The attached patch removes some superfluous variables from the configure 
> script and makes the necessary changes so the checks can work using only
> the remaining variables.
> 
> Regards.

> From 89d0fee1e83282862231819df2da2dfa55297c46 Mon Sep 17 00:00:00 2001
> From: James Almer <jamrial at gmail.com>
> Date: Tue, 18 Dec 2012 03:35:09 -0300
> Subject: [PATCH] configure: Clean up the documentation building mechanism
> 
> The variables texi2html, pod2man and makeinfo became superfluous
> with commit c3da2c19.
> Podpages, manpages, htmlpages and txtpages are enough.
> 
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  configure | 25 +++++++++++--------------
>  1 file changed, 11 insertions(+), 14 deletions(-)
> 
> diff --git a/configure b/configure
> index a50d073..e5cd023 100755
> --- a/configure
> +++ b/configure
> @@ -1396,7 +1396,6 @@ HAVE_LIST="
>      lzo1x_999_compress
>      machine_ioctl_bt848_h
>      machine_ioctl_meteor_h
> -    makeinfo
>      malloc_h
>      MapViewOfFile
>      memalign
> @@ -1408,7 +1407,6 @@ HAVE_LIST="
>      nanosleep
>      PeekNamedPipe
>      perl
> -    pod2man
>      poll_h
>      posix_memalign
>      pthread_cancel
> @@ -1448,7 +1446,6 @@ HAVE_LIST="
>      sys_time_h
>      sys_videoio_h
>      termios_h
> -    texi2html
>      threads
>      unistd_h
>      usleep
> @@ -2020,11 +2017,10 @@ ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
>  ffserver_extralibs='$ldl'
>  
>  # documentation
> -podpages_deps="perl"
> -manpages_deps="perl pod2man"
> -htmlpages_deps="texi2html"
> -txtpages_deps="makeinfo"
> -doc_deps_any="manpages htmlpages podpages txtpages"

> +podpages_deps="perl doc"
> +manpages_deps="podpages"
> +htmlpages_deps="perl doc"
 
I'm not sure this is correct. You still need pod2man to generate man
files from pod files, and you still need texi2html to generate HTML
files from texi files. Thus I believe the correct dependencies are:

podpages_deps="perl" -> since we use the bundled texi2pod perl script
manpages_deps="podpages pod2man"
htmlpages_deps="texi2html"

[...]
-- 
FFmpeg = Faithful and Fiendish Multipurpose Political Elegant Guru