* commit '521979e6':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
	configure

See: f514b5dfMerged-by: Michael Niedermayer <michaelni@gmx.at>