Make scanner compilation more environment agnostic. svn path=/trunk/; revision=34897
svn path=/trunk/; revision=34856