Merge commit '4070e02dfcf8c7d871b4a41d8b591ec0c130c70a' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:44:07 +0000 (00:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:44:21 +0000 (00:44 +0100)
commit1f44b09d58d96ae98e91755cd3db2689e1deaf15
tree95f74ccec50311bca5743ddec46187216784756f
parent16c838b69a4e359705cfd3f1b4c6e2113c934c85
parent4070e02dfcf8c7d871b4a41d8b591ec0c130c70a
Merge commit '4070e02dfcf8c7d871b4a41d8b591ec0c130c70a' into release/2.4

* commit '4070e02dfcf8c7d871b4a41d8b591ec0c130c70a':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
configure

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