script update

configure.ac

@@ -45,14 +45,21 @@ AC_PREFIX_DEFAULT(`pwd`)
 
 # Check MPI first. This might overwrite FC 
 OMPI_FC=$FC
+if test "x$with_mpi" != "x" ; then
 case $FC in
-  *ifort|*ifx)
+  **ifx)
 		MPIFC="mpi$FC"
 		;;
+  *ifort)
+		MPIFC="mpifort"
+		;;
 	*)
 		MPIFC=""
 		;;
 esac
+else
+	MPIFC=""
+fi
 AC_MSG_NOTICE([MPI Fortran compiler: $MPIFC])
 MPICC=""
 PP="-D"