Deal with gcc-4.7's change.
Drop trailing whitespace.
Deal with boost-1.52 change
replaced AM_CONFIG_HEADER to AC_CONFIG_HEADERS
Merge branch 'boost-spirit'
Merge branch 'gcc47'