Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:23:30 +0000 (11:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:26:49 +0000 (11:26 +0100)
commit0425e16d96cccf6de32231ecfc37cde72985dde5
tree684c60947613ef177bc9fc86ec3b46d30075f55e
parent69c32456a045235c67243515384666c741b7e8e6
parent521979e6b1e7a89751aebc285a40d6508f8af48f
Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'

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

Conflicts:
configure

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