Makefile reflects name change in configure.ac.
Merge branch 'upstream' into ubuntu
Updated .in-> .ac file name