Updated configure system to latest version of macros