Per RFC, next major step in cleaning up the build system naming patterns: rename files containing things used by the OPAL layer to be opal_foo.m4 instead of ompi_foo.m4. The ALPS plm is currently checking UGNI, so shift the check_ugni.m4 to orte for now.

This commit was SVN r31641.

autogen.pl

@@ -1076,7 +1076,7 @@ $dnl_line\n\n";
 # Verify that we're in the OMPI root directorty by checking for a token file.
 
 my_die "Not at the root directory of an OMPI source tree"
-    if (! -f "config/ompi_try_assemble.m4");
+    if (! -f "config/opal_try_assemble.m4");
 
 # Now that we've verified that we're in the top-level OMPI directory,
 # set the sentinel file to remove if we abort.

config/opal_mca.m4

@@ -321,7 +321,7 @@ AC_DEFUN([MCA_ORDER_COMPONENT_LIST], [
                     [m4_ifdef([MCA_]$1[_]$2[_]mca_component[_PRIORITY], [], 
                          [m4_fatal([MCA_$1_$2_]mca_component[_PRIORITY not found, but required.])])])])
     m4_define([component_list], 
-              [esyscmd([config/ompi_mca_priority_sort.pl] m4_foreach([mca_component], [mca_$1_$2_m4_config_component_list],
+              [esyscmd([config/opal_mca_priority_sort.pl] m4_foreach([mca_component], [mca_$1_$2_m4_config_component_list],
                         [m4_ifval(mca_component, [mca_component ]OMPI_EVAL_ARG([MCA_]$1[_]$2[_]mca_component[_PRIORITY ]))]))])
 ])