--Added separate --with-mpi option