Clean up of configure.ac, added status output
resolved merge conflict