Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 21:34:18 +0000 (23:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 21:34:25 +0000 (23:34 +0200)
commita99de9ca2ccbe5f70f887982a909f95820cd1cbf
tree2cab26422d9c43397235c2b1561d1309914f58e1
parent1c84aad718f0b2a6c8bd318ebc08240dcbe5ae8b
parenta0ce85ac7de098d3f9b53b51b77a09bad700a011
Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'

* commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011':
  configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

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