Merge pull request #3618 from clumens/config-naming
Consistently name constants defined in configure.ac