Merged autotools changes (configure.in, src/plugin.c, src/Makefile.am, Makefile.am...