Fix #838: build with "USE_BUNDLED=OFF" fails to find dependencies

Stop forcing some platform setting that are really intended to be used
for Travis CI.  Under other systems, like Arch Linux, it prevents
dependencies from being correctly located.
Merge pull request #844:

'Fix #838: build with "USE_BUNDLED=OFF" fails to find dependencies'