Include proper conditional checks for CVMFS detection

Fixes issue #4772