Pick Shahdzad's fix for m4 position and add the relocation of all the automake modules