Always enable MPI support as soon as some mpicc was found or provided.

configure.ac

@@ -673,51 +673,29 @@ AC_ARG_WITH(mpicc, [AS_HELP_STRING([--with-mpicc[=<path to mpicc>]],
 			[Path of the mpicc compiler])],
 	[
 		if test x$withval = xyes; then
-			AC_MSG_ERROR(--with-mpi must be given a pathname)
+			AC_MSG_ERROR(--with-mpicc must be given a pathname)
 		else
-			use_mpi=forceyes
 			mpicc_path=$withval
 		fi
 	],
 	[
 		# nothing was specified: default value is used
 		AC_PATH_PROG(mpicc_path, mpicc, [no], [])
-		use_mpi=maybe
 	])
 
-AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi],
-			[Generate a library to use StarPU with MPI])],
-	[
-		if test x$withval != xno; then
-			use_mpi=yes
-		else
-			# explicitly without mpi
-			use_mpi=no
-		fi
-	],
-	[
-		# nothing was specified, the MPI lib is generated only if some
-		# mpicc was explicitely specified (thus implicitely indicating
-		# MPI support).
-		if test x$use_mpi = xforceyes; then
-			use_mpi=yes
-		else
-			use_mpi=no
-		fi
-	])
-
-if test x$use_mpi = xyes; then
-	# We test if the MPICC compiler exists
-	if test ! -x $mpicc_path; then
-		#MPICC does not exists or is not executable
-		AC_MSG_ERROR(The mpicc compiler is not valid)
-	fi
-
-	AC_MSG_CHECKING(mpicc path)
-	AC_MSG_RESULT($mpicc_path)
-	AC_SUBST(MPICC, $mpicc_path)
+# We test if the MPICC compiler exists
+if test ! -x $mpicc_path; then
+	#MPICC does not exists or is not executable
+	AC_MSG_ERROR(The mpicc compiler is not valid)
+	use_mpi=no
+else
+	use_mpi=yes
 fi
 
+AC_MSG_CHECKING(mpicc path)
+AC_MSG_RESULT($mpicc_path)
+AC_SUBST(MPICC, $mpicc_path)
+
 AC_MSG_CHECKING(whether the MPI library should be generated)
 AC_MSG_RESULT($use_mpi)
 AC_SUBST(USE_MPI, $use_mpi)

doc/starpu.texi

@@ -529,7 +529,6 @@ Specify the location of the Gordon SDK.
 * --with-fxt::                  
 * --with-perf-model-dir::       
 * --with-mpicc::                
-* --with-mpi::                  
 * --with-goto-dir::             
 * --with-atlas-dir::            
 @end menu
@@ -616,15 +615,6 @@ current user's home).
 @table @asis
 @item @emph{Description}:
 Specify the location of the @code{mpicc} compiler to be used for starpumpi.
-@c TODO: also just use AC_PROG
-@end table
-
-@node --with-mpi
-@subsubsection @code{--with-mpi}
-@table @asis
-@item @emph{Description}:
-Enable building libstarpumpi.
-@c TODO: rather just use the availability of mpicc instead of a second option
 @end table
 
 @node --with-goto-dir