fix auto-detection
Merge branch 'master' into openal

Conflicts:
	CMakeLists.txt