From fdd35f301acb69276653116868fbfd8cadfebbca Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 6 May 2014 03:20:16 +0000 Subject: [PATCH] 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 | 2 +- ...mpi_check_compiler_works.m4 => opal_check_compiler_works.m4} | 0 config/{ompi_check_func_lib.m4 => opal_check_func_lib.m4} | 0 config/{ompi_check_icc.m4 => opal_check_icc.m4} | 0 config/{ompi_check_package.m4 => opal_check_package.m4} | 0 config/{ompi_check_ps.m4 => opal_check_ps.m4} | 0 config/{ompi_check_vendor.m4 => opal_check_vendor.m4} | 0 config/{ompi_check_withdir.m4 => opal_check_withdir.m4} | 0 config/{ompi_config_pthreads.m4 => opal_config_pthreads.m4} | 0 config/{ompi_config_subdir.m4 => opal_config_subdir.m4} | 0 .../{ompi_config_subdir_args.m4 => opal_config_subdir_args.m4} | 0 ...re_contains_optflags.m4 => opal_ensure_contains_optflags.m4} | 0 config/{ompi_find_type.m4 => opal_find_type.m4} | 0 config/{ompi_load_platform.m4 => opal_load_platform.m4} | 0 config/{ompi_mca.m4 => opal_mca.m4} | 2 +- config/{ompi_mca_priority_sort.pl => opal_mca_priority_sort.pl} | 0 config/{ompi_save_version.m4 => opal_save_version.m4} | 0 ...tup_component_package.m4 => opal_setup_component_package.m4} | 0 config/{ompi_try_assemble.m4 => opal_try_assemble.m4} | 0 config/{ompi_check_ugni.m4 => orte_check_ugni.m4} | 0 20 files changed, 2 insertions(+), 2 deletions(-) rename config/{ompi_check_compiler_works.m4 => opal_check_compiler_works.m4} (100%) rename config/{ompi_check_func_lib.m4 => opal_check_func_lib.m4} (100%) rename config/{ompi_check_icc.m4 => opal_check_icc.m4} (100%) rename config/{ompi_check_package.m4 => opal_check_package.m4} (100%) rename config/{ompi_check_ps.m4 => opal_check_ps.m4} (100%) rename config/{ompi_check_vendor.m4 => opal_check_vendor.m4} (100%) rename config/{ompi_check_withdir.m4 => opal_check_withdir.m4} (100%) rename config/{ompi_config_pthreads.m4 => opal_config_pthreads.m4} (100%) rename config/{ompi_config_subdir.m4 => opal_config_subdir.m4} (100%) rename config/{ompi_config_subdir_args.m4 => opal_config_subdir_args.m4} (100%) rename config/{ompi_ensure_contains_optflags.m4 => opal_ensure_contains_optflags.m4} (100%) rename config/{ompi_find_type.m4 => opal_find_type.m4} (100%) rename config/{ompi_load_platform.m4 => opal_load_platform.m4} (100%) rename config/{ompi_mca.m4 => opal_mca.m4} (99%) rename config/{ompi_mca_priority_sort.pl => opal_mca_priority_sort.pl} (100%) rename config/{ompi_save_version.m4 => opal_save_version.m4} (100%) rename config/{ompi_setup_component_package.m4 => opal_setup_component_package.m4} (100%) rename config/{ompi_try_assemble.m4 => opal_try_assemble.m4} (100%) rename config/{ompi_check_ugni.m4 => orte_check_ugni.m4} (100%) diff --git a/autogen.pl b/autogen.pl index 10aefc8d75..d883eae041 100755 --- a/autogen.pl +++ b/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. diff --git a/config/ompi_check_compiler_works.m4 b/config/opal_check_compiler_works.m4 similarity index 100% rename from config/ompi_check_compiler_works.m4 rename to config/opal_check_compiler_works.m4 diff --git a/config/ompi_check_func_lib.m4 b/config/opal_check_func_lib.m4 similarity index 100% rename from config/ompi_check_func_lib.m4 rename to config/opal_check_func_lib.m4 diff --git a/config/ompi_check_icc.m4 b/config/opal_check_icc.m4 similarity index 100% rename from config/ompi_check_icc.m4 rename to config/opal_check_icc.m4 diff --git a/config/ompi_check_package.m4 b/config/opal_check_package.m4 similarity index 100% rename from config/ompi_check_package.m4 rename to config/opal_check_package.m4 diff --git a/config/ompi_check_ps.m4 b/config/opal_check_ps.m4 similarity index 100% rename from config/ompi_check_ps.m4 rename to config/opal_check_ps.m4 diff --git a/config/ompi_check_vendor.m4 b/config/opal_check_vendor.m4 similarity index 100% rename from config/ompi_check_vendor.m4 rename to config/opal_check_vendor.m4 diff --git a/config/ompi_check_withdir.m4 b/config/opal_check_withdir.m4 similarity index 100% rename from config/ompi_check_withdir.m4 rename to config/opal_check_withdir.m4 diff --git a/config/ompi_config_pthreads.m4 b/config/opal_config_pthreads.m4 similarity index 100% rename from config/ompi_config_pthreads.m4 rename to config/opal_config_pthreads.m4 diff --git a/config/ompi_config_subdir.m4 b/config/opal_config_subdir.m4 similarity index 100% rename from config/ompi_config_subdir.m4 rename to config/opal_config_subdir.m4 diff --git a/config/ompi_config_subdir_args.m4 b/config/opal_config_subdir_args.m4 similarity index 100% rename from config/ompi_config_subdir_args.m4 rename to config/opal_config_subdir_args.m4 diff --git a/config/ompi_ensure_contains_optflags.m4 b/config/opal_ensure_contains_optflags.m4 similarity index 100% rename from config/ompi_ensure_contains_optflags.m4 rename to config/opal_ensure_contains_optflags.m4 diff --git a/config/ompi_find_type.m4 b/config/opal_find_type.m4 similarity index 100% rename from config/ompi_find_type.m4 rename to config/opal_find_type.m4 diff --git a/config/ompi_load_platform.m4 b/config/opal_load_platform.m4 similarity index 100% rename from config/ompi_load_platform.m4 rename to config/opal_load_platform.m4 diff --git a/config/ompi_mca.m4 b/config/opal_mca.m4 similarity index 99% rename from config/ompi_mca.m4 rename to config/opal_mca.m4 index 488af644e1..df63db6198 100644 --- a/config/ompi_mca.m4 +++ b/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 ]))]))]) ]) diff --git a/config/ompi_mca_priority_sort.pl b/config/opal_mca_priority_sort.pl similarity index 100% rename from config/ompi_mca_priority_sort.pl rename to config/opal_mca_priority_sort.pl diff --git a/config/ompi_save_version.m4 b/config/opal_save_version.m4 similarity index 100% rename from config/ompi_save_version.m4 rename to config/opal_save_version.m4 diff --git a/config/ompi_setup_component_package.m4 b/config/opal_setup_component_package.m4 similarity index 100% rename from config/ompi_setup_component_package.m4 rename to config/opal_setup_component_package.m4 diff --git a/config/ompi_try_assemble.m4 b/config/opal_try_assemble.m4 similarity index 100% rename from config/ompi_try_assemble.m4 rename to config/opal_try_assemble.m4 diff --git a/config/ompi_check_ugni.m4 b/config/orte_check_ugni.m4 similarity index 100% rename from config/ompi_check_ugni.m4 rename to config/orte_check_ugni.m4