Replaced custom stuff in config.m4 with standard commands