Changes logic in m4 files for more sense of configure options. Renamed --with-mcfs ro --enable-mcserver