* commit 'dad7a9c7':
  configure: Rework dependency handling for conflicting components

Includes an important fix made by c546147d
as well.
Merged-by: James Almer <jamrial@gmail.com>