Merged changes from issue #54 on config.m4 to the respective template file.