mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-03-11 06:58:18 +00:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: build: Check for pod2man instead of perl for manual page generation Conflicts: configure doc/Makefile The code that this changes is mostly not part of ffmpeg thus only a few whitespaces end up being merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a12b4bd107
2
configure
vendored
2
configure
vendored
@ -4386,7 +4386,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 -v > /dev/null 2>&1 && enable perl || disable perl
|
||||
pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
|
||||
pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
|
||||
rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
|
||||
|
||||
check_header linux/fb.h
|
||||
|
Loading…
Reference in New Issue
Block a user