Fixed incorrect options in Makefile.am/.in.

These options actually were ignored in the Travis build.