Updated automake files to match version used in Ubuntu 12.04