Merge commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 22:27:45 +0000 (00:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 22:28:23 +0000 (00:28 +0200)
commit621d4089a4cff0066d5cfc006cf20d99414ee9f9
treedf4b7bce78139e30b42ace69d91cd9e13ff9e807
parent8b1e920676f6eeeb01422660768f5f92b3811bc6
parente4a462e3eafdfe336f4d079c3ba72a9cdb4748b0
Merge commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0'

* commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0':
  configure: Use require_pkg_config for Speex

Conflicts:
configure

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