Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:29:02 +0000 (19:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:29:27 +0000 (19:29 +0200)
commitc32db6adab9942781cc5a23f62abb839a5595a83
treecb082f4a4cb29801263d950edfe8970cad51d259
parent05f1b4e2ecc4683467669a190e3a53df413de805
parent61c31e4ee7ea79a9e74c0476b81244febf17e6d7
Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'

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

Conflicts:
configure

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