Fix some errors generated by configure.ac
Remove trailing whitespace