Merge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 17 Feb 2016 15:27:50 +0000 (15:27 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 17 Feb 2016 15:36:51 +0000 (15:36 +0000)
* commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6':
  configure: Use `require` for the non-component options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
configure

diff --cc configure
Simple merge