configury: automatically select rte/pmix runtime if ORTE project is not built

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>

autogen.pl

@@ -5,8 +5,8 @@
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
 # Copyright (c) 2013-2014 Intel, Inc.  All rights reserved.
-# Copyright (c) 2015-2016 Research Organization for Information Science
+# Copyright (c) 2015-2019 Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
+#                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2015      IBM Corporation.  All rights reserved.
 #
 # $COPYRIGHT$
@@ -1347,7 +1347,7 @@ push(@{$projects}, { name => "orte", dir => "orte", need_base => 1 })
 push(@{$projects}, { name => "ompi", dir => "ompi", need_base => 1 })
     if (!$no_ompi_arg);
 push(@{$projects}, { name => "oshmem", dir => "oshmem", need_base => 1 })
-    if (!$no_ompi_arg && !$no_orte_arg && !$no_oshmem_arg);
+    if (!$no_ompi_arg && !$no_oshmem_arg);
 push(@{$projects}, { name => "orcm", dir => "orcm", need_base => 1 })
     if (-e "orcm");
 

ompi/mca/rte/orte/Makefile.am

@@ -3,6 +3,8 @@
 #                         All rights reserved.
 # Copyright (c) 2014      Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2016-2018 Intel, Inc.  All rights reserved.
+# Copyright (c) 2019      Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -31,6 +33,7 @@ libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
 man_pages = mpirun.1 mpiexec.1 ompi-clean.1 ompi-server.1
 
 if OPAL_INSTALL_BINARIES
+if PROJECT_ORTE
 nodist_man_MANS = $(man_pages)
 
 install-exec-hook:
@@ -45,6 +48,7 @@ uninstall-local:
 		$(DESTDIR)$(bindir)/ompi-clean$(EXEEXT) \
 		$(DESTDIR)$(bindir)/ompi-server$(EXEEXT)
 
+endif # PROJECT_ORTE
 endif # OPAL_INSTALL_BINARIES
 
 $(top_builddir)/orte/tools/orterun/orterun.1:

ompi/mca/rte/orte/configure.m4

@@ -2,8 +2,9 @@
 #
 # Copyright (c) 2012      Los Alamos National Security, LLC.  All rights reserved.
 # Copyright (c) 2013      Sandia National Laboratories. All rights reserved.
-#
 # Copyright (c) 2017      Intel, Inc. All rights reserved.
+# Copyright (c) 2019      Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -36,13 +37,16 @@ AC_DEFUN([MCA_ompi_rte_orte_POST_CONFIG],[
 AC_DEFUN([MCA_ompi_rte_orte_CONFIG],[
     AC_CONFIG_FILES([ompi/mca/rte/orte/Makefile])
 
-    # This will need to get more complicated when we can build against
+    m4_ifdef([project_orte],
-    # an external ORTE.
+             [# This will need to get more complicated when we can build against
-    AC_ARG_WITH([orte],
+              # an external ORTE.
-        AC_HELP_STRING([--with-orte],
+              AC_ARG_WITH([orte],
-                       [Use ORTE run-time environment (default: yes)]))
+                  AC_HELP_STRING([--with-orte],
-    AS_IF([test "$with_orte" != "no"],
+                                 [Use ORTE run-time environment (default: yes)]))
-          [$1],
+              AS_IF([test "$with_orte" != "no"],
-          [AC_MSG_NOTICE([ORTE disabled by user])
+                    [$1],
-           $2])
+                    [AC_MSG_NOTICE([ORTE disabled by user])
+                     $2])
+             ],
+             [$2])
 ])

ompi/mca/rte/pmix/configure.m4

@@ -2,8 +2,9 @@
 #
 # Copyright (c) 2012      Los Alamos National Security, LLC.  All rights reserved.
 # Copyright (c) 2013      Sandia National Laboratories. All rights reserved.
-#
 # Copyright (c) 2017      Intel, Inc. All rights reserved.
+# Copyright (c) 2019      Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -35,11 +36,13 @@ AC_DEFUN([MCA_ompi_rte_pmix_POST_CONFIG],[
 AC_DEFUN([MCA_ompi_rte_pmix_CONFIG],[
     AC_CONFIG_FILES([ompi/mca/rte/pmix/Makefile])
 
-    AC_ARG_WITH([ompi-pmix-rte],
+    m4_ifdef([project_orte],
-        AC_HELP_STRING([--with-ompi-pmix-rte],
+             [AC_ARG_WITH([ompi-pmix-rte],
-                       [Use PMIx as the OMPI run-time environment (default: no)]))
+                          AC_HELP_STRING([--with-ompi-pmix-rte],
-    AS_IF([test "$with_ompi_pmix_rte" == "yes"],
+                                         [Use PMIx as the OMPI run-time environment (default: no)]))
-          [$1
+              AS_IF([test "$with_ompi_pmix_rte" == "yes"],
-           AC_MSG_NOTICE([PMIx RTE selected by user])],
+                    [$1
-          [$2])
+                     AC_MSG_NOTICE([PMIx RTE selected by user])],
+                    [$2])],
+             [$1])
 ])