Refactored config.m4