[PATCH 1/2] Do not check stuff required by server if disabled.

[Josh Stone]

Thanks.  I pushed patch 1, but I ran autoreconf myself so we don't
regress in autotools versions.

Josh