Changes so that make dist and a build of the tarball work.
Merge remote-tracking branch 'origin/modules'

Conflicts:
	configure.ac

Last set of changes made on the modules branch regarding the
dist target and building from the tarball.
Moved configure.ac to configure_standard.ac

The 'mosules' build uses a new configure.ac and several
AM_CONDITIONAL variables; the standard build configure.ac
does not and there's no way to make automake be 'conditional'
itself. So... There are two configure.ac files, one named
..._modules and the other named ..._standard. Thre's no
file named 'configure.ac' in git so that builders don't forget
to switch.
Fixed configre_modules.ac - stuff got lost in the merge