diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 02:35:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 02:35:38 +0100 |
| commit | a12b4bd107cf028e44cab8dafca61a866cecd252 (patch) | |
| tree | f1256dfb35b4dc17d35b6d0a9453ec96f8fe35f3 /configure | |
| parent | 6f24566f56b8ed0424a77aede46bb3ddf06a28c8 (diff) | |
| parent | 92f0abb27fe26efdf33bec51d1f583e46036ac74 (diff) | |
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |