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>

diff --cc configure
index aaf5c8f7bde8a9192caf7613f6b536b78bcc097b,eddf40b9b19f695a2f9f251ad63e4a9aaa82c029..f2533b4e5ee5c796e3bb0ed5a7e6ae3784f6adbc
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4371,28 -3879,14 +4371,28 @@@ if check_pkg_config sdl SDL_events.h SD
      check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
      check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags &&
      enable sdl
 +else
 +  if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
 +    sdl_cflags=$("${SDL_CONFIG}" --cflags)
 +    sdl_libs=$("${SDL_CONFIG}" --libs)
 +    check_func_headers SDL_version.h SDL_Linked_Version $sdl_cflags $sdl_libs &&
 +    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
 +    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags &&
 +    enable sdl
 +  fi
  fi
 +enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
  
- pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
 +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
 -texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
+ 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
 +check_header linux/videodev.h
  check_header linux/videodev2.h
 -check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
 +check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
  
  check_header sys/videoio.h