Merge commit '9409c9bdbfd829353473ee6cc3e91c726481c069'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 21:24:47 +0000 (22:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 21:25:34 +0000 (22:25 +0100)
commit523a803b7352564fcd28ec6d5dc0bfb6f8c5534f
tree231a37281698cbcff5226d60c76e9a03fbdf1359
parent00f25e0a990f9200806fc23d9054a47169db69a2
parent9409c9bdbfd829353473ee6cc3e91c726481c069
Merge commit '9409c9bdbfd829353473ee6cc3e91c726481c069'

* commit '9409c9bdbfd829353473ee6cc3e91c726481c069':
  configure: Disable networking if winsock2.h is available but winsock functions aren't

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