Added m4 and changing makefiles