Update autotools's files
Tidy code a little bit