Break "make dist" if a package isn't configured

With a previous commit, it is now possible that configure will not
run the PMIX or PRRTE configure scripts.  This means that "make dist"
will not recurse into the package's directory and those packages will
unexpectedly not be in the dist tarball.  This patch avoids that
situation by explicitly breaking "make dist" in those situations,
printing the package that caused the issue.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>
(cherry picked from commit 5a8fe8b)

Author: bwbarrett

Makefile.am

@@ -12,7 +12,7 @@
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2015 Los Alamos National Security, Inc.  All rights reserved.
 # Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
-# Copyright (c) 2017-2020 Amazon.com, Inc. or its affiliates.
+# Copyright (c) 2017-2021 Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
 # Copyright (c) 2020      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
@@ -34,6 +34,14 @@ dist-hook:
 		echo "AUTHORS file is empty; aborting distribution"; \
 		exit 1; \
 	fi
+	@if test -n "$(OPAL_MAKEDIST_DISABLE)" ; then \
+		echo "#########################################################################"; \
+		echo "#"; \
+		echo "# make dist is disabled due to the following packages: $(OPAL_MAKEDIST_DISABLE)"; \
+		echo "#"; \
+		echo "#########################################################################"; \
+		exit 1; \
+	fi
 
 # Check for common symbols.  Use a "-hook" to increase the odds that a
 # developer will see it at the end of their installation process.

config/ompi_setup_prrte.m4

@@ -59,7 +59,12 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
 		# failing to configure in a situation where it isn't
 		# desired.
                 _OMPI_SETUP_PRRTE_INTERNAL([prrte_setup_internal_happy=1],
-                                           [prrte_setup_internal_happy=0])])])
+                                           [prrte_setup_internal_happy=0])])
+
+         # if we have a pmix package and configure did not complete
+         # successfullly (or wasn't started), then disable make dist.
+         AS_IF([test $prrte_setup_internal_happy != 1],
+               [OPAL_MAKEDIST_DISABLE="$OPAL_MAKEDIST_DISABLE PRRTE"])])
 
     # unless internal specifically requested by the user, try to find
     # an external that works.

config/opal_config_pmix.m4

@@ -114,7 +114,12 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
                                         [--with-pmix=[[^ 	]]*], [--with-platform=[[^ 	]]*]],
                                        [internal_pmix_happy=1])
                 OPAL_SUBDIR_ENV_RESTORE([opal_pmix_configure])
-                OPAL_3RDPARTY_DIST_SUBDIRS="$OPAL_3RDPARTY_DIST_SUBDIRS openpmix"])])
+                OPAL_3RDPARTY_DIST_SUBDIRS="$OPAL_3RDPARTY_DIST_SUBDIRS openpmix"])
+
+         # if we have a pmix package and configure did not complete
+         # successfullly (or wasn't started), then disable make dist.
+         AS_IF([test $internal_pmix_happy != 1],
+               [OPAL_MAKEDIST_DISABLE="$OPAL_MAKEDIST_DISABLE PMIX"])])
 
     # unless internal specifically requested by the user, try to find
     # an external that works.

configure.ac

@@ -23,13 +23,11 @@
 # Copyright (c) 2014-2017 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2016-2017 IBM Corporation.  All rights reserved.
-# Copyright (c) 2018      Amazon.com, Inc. or its affiliates.
+# Copyright (c) 2018-2021 Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
 # Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 # Copyright (c) 2019      Triad National Security, LLC. All rights
 #                         reserved.
-# Copyright (c) 2020      Amazon.com, Inc. or its affiliates.
-#                         All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -68,6 +66,9 @@ OPAL_CAPTURE_CONFIGURE_CLI([OPAL_CONFIGURE_CLI])
 # because it twiddles random bits of autoconf
 OPAL_LOAD_PLATFORM
 
+# Start a list of packages / modules / etc. that want to disable "make dist".
+OPAL_MAKEDIST_DISABLE=""
+
 #
 # Start it up
 #
@@ -1519,6 +1520,10 @@ AC_CONFIG_FILES([contrib/dist/mofed/debian/rules],
 AC_CONFIG_FILES([contrib/dist/mofed/compile_debian_mlnx_example],
                 [chmod +x contrib/dist/mofed/compile_debian_mlnx_example])
 
+AS_IF([test -n "$OPAL_MAKEDIST_DISABLE"],
+      [AC_MSG_WARN(["make dist" will be disabled due to: $OPAL_MAKEDIST_DISABLE])])
+AC_SUBST([OPAL_MAKEDIST_DISABLE])
+
 OPAL_CONFIG_FILES
 m4_ifdef([project_ompi], [OMPI_CONFIG_FILES])
 m4_ifdef([project_oshmem], [OSHMEM_CONFIG_FILES])