Fix alignment
Move to configure.in