These commits broke compiling / linking if one package was found
but the includes / libraries were not added. We need a different
approach to hide the ENABLE_* trick from the user and keep full
testing capabilities.
This reverts commits 0f12caff
and d75c3a46.