[FFmpeg-devel] [PATCH] build: check for perl presence and compile POD pages only in that case
Stefano Sabatini
stefasab at gmail.com
Thu Aug 9 23:39:44 CEST 2012
perl is required by the texi2pod.pl script. Should avoid FATE failure on
Haiku, where perl is apparently not available.
---
configure | 5 ++++-
doc/Makefile | 10 ++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 6c4047f..6dc983f 100755
--- a/configure
+++ b/configure
@@ -1285,6 +1285,7 @@ HAVE_LIST="
mmap
nanosleep
PeekNamedPipe
+ perl
pod2man
poll_h
posix_memalign
@@ -1838,7 +1839,7 @@ ffprobe_deps="avcodec avformat"
ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
ffserver_extralibs='$ldl'
-doc_deps_any="texi2html makeinfo pod2man"
+doc_deps_any="texi2html makeinfo perl pod2man"
# tests
colormatrix1_test_deps="colormatrix_filter"
@@ -3515,6 +3516,7 @@ 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
+perl --version > /dev/null 2>&1 && enable perl || disable perl
pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
check_header linux/fb.h
@@ -3857,6 +3859,7 @@ echo "openssl enabled ${openssl-no}"
echo "zlib enabled ${zlib-no}"
echo "bzlib enabled ${bzlib-no}"
echo "texi2html enabled ${texi2html-no}"
+echo "perl enabled ${perl-no}"
echo "pod2man enabled ${pod2man-no}"
echo "makeinfo enabled ${makeinfo-no}"
test -n "$random_seed" &&
diff --git a/doc/Makefile b/doc/Makefile
index 845f5f7..16c13fc 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -11,9 +11,15 @@ HTMLPAGES = $(PROGS-yes:%=doc/%.html) \
TXTPAGES = doc/fate.txt \
+ifdef HAVE_PERL
+ifdef HAVE_POD2MAN
+HAVE_MANPAGES=yes
+endif
+endif
DOCS-$(HAVE_TEXI2HTML) += $(HTMLPAGES)
-DOCS-$(HAVE_POD2MAN) += $(MANPAGES) $(PODPAGES)
+DOCS-$(HAVE_PERL) += $(PODPAGES)
+DOCS-$(HAVE_MANPAGES) += $(MANPAGES)
DOCS-$(HAVE_MAKEINFO) += $(TXTPAGES)
DOCS = $(DOCS-yes)
@@ -53,7 +59,7 @@ $(DOCS): | doc/
install-man:
-ifdef HAVE_POD2MAN
+ifdef HAVE_MANPAGES
install-progs-$(CONFIG_DOC): install-man
install-man: $(MANPAGES)
--
1.7.5.4
More information about the ffmpeg-devel
mailing list