Merge commit '06db45523c1068c24f049ef2b20fcdead3bf36d8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 16:54:57 +0000 (18:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 16:54:57 +0000 (18:54 +0200)
commitcec345625480482d99e7bc6c275979a336769488
treee69e953e581739db4b836c7aa0666301db20d94a
parentce4e57dbb51ac106a61fcd98330af9a619eea857
parent06db45523c1068c24f049ef2b20fcdead3bf36d8
Merge commit '06db45523c1068c24f049ef2b20fcdead3bf36d8'

* commit '06db45523c1068c24f049ef2b20fcdead3bf36d8':
  configure: Support the extended pkgconf syntax

Conflicts:
configure

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