* commit '61c31e4e':
  configure: Properly set zlib dependencies for all components

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>