From: James Simmons <uja.ornl@gmail.com>
Date: Wed, 21 May 2014 14:37:21 +0000 (-0400)
Subject: LU-5090 build: restore enable-mpitest option
X-Git-Tag: 2.5.60~46
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=148995d855297677e13f00e181a53347b5e767e9

LU-5090 build: restore enable-mpitest option

Originally the enable-mpitests configure option was deeply
embedded in the liblustre configuration test. With the
removal of liblibustre this option got accidentally removed.
This patch restores this option.

Change-Id: I92ab1d3f187f579dca4bb6825a5bf1e80dbbee06
Signed-off-by: James Simmons <uja.ornl@gmail.com>
Reviewed-on: http://review.whamcloud.com/10384
Reviewed-by: Brian J. Murrell <brian.murrell@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index cbcd90d..aa75c04 100644
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -643,6 +643,7 @@ LB_CONFIG_DOCS
 LB_CONFIG_UTILS
 LB_CONFIG_TESTS
 LC_CONFIG_CLIENT
+LB_CONFIG_MPITESTS
 LB_CONFIG_SERVERS
 
 # two macros for cmd3
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index e14184d..0ed0ee1 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1597,6 +1597,49 @@ AC_MSG_RESULT([$enable_client])
 ]) # LC_CONFIG_CLIENT
 
 #
+# --enable-mpitests
+#
+AC_DEFUN([LB_CONFIG_MPITESTS], [
+AC_ARG_ENABLE([mpitests],
+	AC_HELP_STRING([--enable-mpitests==yes|no|mpicc wrapper],
+		       [include mpi tests]), [
+		enable_mpitests=yes
+		case $enableval in
+		yes)
+			MPICC_WRAPPER=mpicc
+			;;
+		no)
+			enable_mpitests=no
+			;;
+		*)
+			MPICC_WRAPPER=$enableval
+			;;
+		esac
+	], [
+		enable_mpitests="yes"
+		MPICC_WRAPPER=mpicc
+	])
+
+	if test x$enable_mpitests != xno; then
+		oldcc=$CC
+		CC=$MPICC_WRAPPER
+		AC_CACHE_CHECK([whether mpitests can be built],
+				lb_cv_mpi_tests, [
+		AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+			#include <mpi.h>
+			int main(void) {
+				int flag;
+				MPI_Initialized(&flag);
+				return 0;
+			}
+		])], [], [enable_mpitests="no"])
+		])
+		CC=$oldcc
+	fi
+	AC_SUBST(MPICC_WRAPPER)
+]) # LB_CONFIG_MPITESTS
+
+#
 # LC_CONFIG_QUOTA
 #
 # whether to enable quota support global control