Merge pull request #11004 from jsquyres/pr/conditionally-install-wrapper-compiler-man-pages

docs: conditionally install wrapper compiler man pages

Author: jsquyres

autogen.pl

@@ -46,10 +46,6 @@
 my @subdirs;
 
 # Command line parameters
-my $no_ompi_arg = 0;
-my $no_orte_arg = 0;
-my $no_prrte_arg = 0;
-my $no_oshmem_arg = 0;
 my $no_3rdparty_arg = "";
 my $quiet_arg = 0;
 my $debug_arg = 0;
@@ -1297,11 +1293,7 @@ sub replace_config_sub_guess {
 
 # Command line parameters
 
-my $ok = Getopt::Long::GetOptions("no-ompi" => \$no_ompi_arg,
-                                  "no-orte" => \$no_orte_arg,
-                                  "no-prrte" => \$no_prrte_arg,
-                                  "no-oshmem" => \$no_oshmem_arg,
-                                  "no-3rdparty=s" => \$no_3rdparty_arg,
+my $ok = Getopt::Long::GetOptions("no-3rdparty=s" => \$no_3rdparty_arg,
                                   "quiet|q" => \$quiet_arg,
                                   "debug|d" => \$debug_arg,
                                   "help|h" => \$help_arg,
@@ -1316,10 +1308,6 @@ sub replace_config_sub_guess {
     print "Invalid command line argument.\n\n"
         if (!$ok);
     print "Options:
-  --no-ompi | -no-ompi          Do not build the Open MPI layer
-  --no-orte | -no-orte          Do not build Open MPI's runtime support (alias for --no-prrte)
-  --no-prrte | -no-prrte        Do not build Open MPI's runtime support
-  --no-oshmem | -no-oshmem      Do not build the OSHMEM layer
   --no-3rdparty <package>       Do not build the listed 3rd-party package (comma separtated list)
   --quiet | -q                  Do not display normal verbose output
   --debug | -d                  Output lots of debug information
@@ -1344,24 +1332,6 @@ sub replace_config_sub_guess {
 my $project_name_long = "Open MPI";
 my $project_name_short = "openmpi";
 
-if (! -e "ompi") {
-    $no_ompi_arg = 1;
-    debug "No ompi subdirectory found - will not build MPI layer\n";
-}
-if (! -e "oshmem") {
-    $no_oshmem_arg = 1;
-    debug "No oshmem subdirectory found - will not build OSHMEM\n";
-}
-# alias --no-orte to --no-prrte
-if ($no_orte_arg == 1) {
-    $no_prrte_arg = 1;
-}
-
-if ($no_ompi_arg == 1) {
-    $project_name_long = "Open Portability Access Layer";
-    $project_name_short = "open-pal";
-}
-
 my_die "Invalid value for --jobs $automake_jobs. Must be greater than 0."
     if (defined $automake_jobs && $automake_jobs <= 0);
 
@@ -1419,9 +1389,6 @@ sub replace_config_sub_guess {
 
 my @enabled_3rdparty_packages = ();
 my @disabled_3rdparty_packages = split(/,/, $no_3rdparty_arg);
-if ($no_prrte_arg) {
-    push(@disabled_3rdparty_packages, "prrte");
-}
 # Alias: 'openpmix' -> 'pmix'
 if (list_contains("openpmix", @disabled_3rdparty_packages)) {
     push(@disabled_3rdparty_packages, "pmix");
@@ -1583,10 +1550,8 @@ sub replace_config_sub_guess {
 # Top-level projects to examine
 my $projects;
 push(@{$projects}, { name => "opal", dir => "opal", 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_oshmem_arg);
+push(@{$projects}, { name => "ompi", dir => "ompi", need_base => 1 });
+push(@{$projects}, { name => "oshmem", dir => "oshmem", need_base => 1 });
 
 $m4 .= "dnl Separate m4 define for each project\n";
 foreach my $p (@$projects) {
@@ -1694,11 +1659,9 @@ sub replace_config_sub_guess {
 #---------------------------------------------------------------------------
 
 # Find MPI extensions
-if (!$no_ompi_arg) {
-    ++$step;
-    verbose "\n$step. Searching for Open MPI extensions\n\n";
-    mpiext_run_global("ompi/mpiext");
-}
+++$step;
+verbose "\n$step. Searching for Open MPI extensions\n\n";
+mpiext_run_global("ompi/mpiext");
 
 #---------------------------------------------------------------------------
 

config/ompi_setup_mpi_fortran.m4

@@ -887,4 +887,9 @@ end type test_mpi_handle],
     AC_DEFINE_UNQUOTED(OMPI_BUILD_FORTRAN_BINDINGS,
                        $OMPI_BUILD_FORTRAN_BINDINGS,
                        [The level of fortran bindings to be built])
+
+    # This is an overall "are we building any Fortran MPI bindings"
+    # conditional
+    AM_CONDITIONAL([OMPI_BUILD_ANY_FORTRAN_BINDINGS],
+                   [test $OMPI_BUILD_FORTRAN_BINDINGS -gt 0])
 ])

docs/Makefile.am

@@ -796,29 +796,41 @@ EXTRA_DIST += \
 ###########################################################################
 
 # These files are not generated by Sphinx (they are redirects to
-# Sphinx-generated man pages).
-OMPI_MAN1_REDIRECTS = \
-        man-openmpi/man1/mpicc.1 \
+# Sphinx-generated man pages) -- they exist directly in Git.  We
+# *always* want these files to be in EXTRA_DIST (so that they're in
+# distribution tarballs).  We'll decide later whether we install each
+# of these (e.g., if configure disabled the Java bindings, we won't
+# install mpijavac.1).
+OMPI_MAN1_C_REDIRECTS = man-openmpi/man1/mpicc.1
+OMPI_MAN1_CXX_REDIRECTS = \
         man-openmpi/man1/mpicxx.1 \
-        man-openmpi/man1/mpic++.1 \
+        man-openmpi/man1/mpic++.1
+OMPI_MAN1_FORTRAN_REDIRECTS = \
         man-openmpi/man1/mpifort.1 \
         man-openmpi/man1/mpif77.1 \
-        man-openmpi/man1/mpif90.1 \
-        man-openmpi/man1/mpijavac.1
+        man-openmpi/man1/mpif90.1
+OMPI_MAN1_JAVA_REDIRECTS = man-openmpi/man1/mpijavac.1
 
-OSHMEM_MAN1_REDIRECTS = \
+OSHMEM_MAN1_C_REDIRECTS = \
         man-openshmem/man1/oshcc.1 \
+        man-openshmem/man1/shmemcc.1
+OSHMEM_MAN1_CXX_REDIRECTS = \
         man-openshmem/man1/oshcxx.1 \
         man-openshmem/man1/oshc++.1 \
-        man-openshmem/man1/oshfort.1 \
-        man-openshmem/man1/shmemcc.1 \
         man-openshmem/man1/shmemcxx.1 \
-        man-openshmem/man1/shmemc++.1 \
+        man-openshmem/man1/shmemc++.1
+OSHMEM_MAN1_FORTRAN_REDIRECTS = \
+        man-openshmem/man1/oshfort.1 \
         man-openshmem/man1/shmemfort.1
 
 EXTRA_DIST += \
-        $(OMPI_MAN1_REDIRECTS) \
-        $(OSHMEM_MAN1_REDIRECTS)
+        $(OMPI_MAN1_C_REDIRECTS) \
+        $(OMPI_MAN1_CXX_REDIRECTS) \
+        $(OMPI_MAN1_FORTRAN_REDIRECTS) \
+        $(OMPI_MAN1_JAVA_REDIRECTS) \
+        $(OSHMEM_MAN1_C_REDIRECTS) \
+        $(OSHMEM_MAN1_CXX_REDIRECTS) \
+        $(OSHMEM_MAN1_FORTRAN_REDIRECTS)
 
 ###########################################################################
 if OPAL_BUILD_DOCS
@@ -877,15 +889,32 @@ if OPAL_INSTALL_DOCS
 
 man1_MANS = \
         $(OMPI_MAN1_BUILT) \
-        $(OMPI_MAN1_REDIRECTS)
+        $(OMPI_MAN1_C_REDIRECTS)
+if OMPI_HAVE_CXX_COMPILER
+man1_MANS += $(OMPI_MAN1_CXX_REDIRECTS)
+endif
+if OMPI_BUILD_ANY_FORTRAN_BINDINGS
+man1_MANS += $(OMPI_MAN1_FORTRAN_REDIRECTS)
+endif
+if OMPI_WANT_JAVA_BINDINGS
+man1_MANS += $(OMPI_MAN1_JAVA_REDIRECTS)
+endif
 
 man3_MANS = $(OMPI_MAN3_BUILT)
 man5_MANS = $(OMPI_MAN5_BUILT)
 
 if PROJECT_OSHMEM
 man1_MANS += \
         $(OSHMEM_MAN1_BUILT) \
-        $(OSHMEM_MAN1_REDIRECTS)
+        $(OSHMEM_MAN1_C_REDIRECTS)
+# There is no OSHMEM equivalent of this conditional; just use the OMPI
+# conditional.
+if OMPI_HAVE_CXX_COMPILER
+man1_MANS += $(OSHMEM_MAN1_CXX_REDIRECTS)
+endif
+if OSHMEM_BUILD_FORTRAN_BINDINGS
+man1_MANS += $(OSHMEM_MAN1_FORTRAN_REDIRECTS)
+endif
 
 man3_MANS += $(OSHMEM_MAN3_BUILT)
 endif