diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4 index 8d20ecc5ef..d163d5d839 100644 --- a/config/ompi_configure_options.m4 +++ b/config/ompi_configure_options.m4 @@ -26,7 +26,7 @@ dnl $HEADER$ dnl AC_DEFUN([OMPI_CONFIGURE_OPTIONS],[ -ompi_show_subtitle "OMPI Configuration options" +opal_show_subtitle "OMPI Configuration options" # # Disable MPI layer? diff --git a/config/ompi_contrib.m4 b/config/ompi_contrib.m4 index 56c721f302..572ee00e3c 100644 --- a/config/ompi_contrib.m4 +++ b/config/ompi_contrib.m4 @@ -41,7 +41,7 @@ AC_DEFUN([OMPI_CONTRIB],[ [Comma-separated list of contributed package names that will not be built. Possible values: ompi_mpicontrib_list. Example: "--enable-contrib-no-build=foo,bar" will disable building both the "foo" and "bar" contributed software packages (default: none -- i.e., build all possible contrib packages)])) # Parse the list to see what we should not build - ompi_show_subtitle "Configuring contributed software packages" + opal_show_subtitle "Configuring contributed software packages" AC_MSG_CHECKING([which contributed software packages should be disabled]) if test "$enable_contrib_no_build" = "yes"; then AC_MSG_RESULT([yes]) diff --git a/config/ompi_interix.m4 b/config/ompi_interix.m4 index 1f13b2f3fe..c745aad517 100644 --- a/config/ompi_interix.m4 +++ b/config/ompi_interix.m4 @@ -33,7 +33,7 @@ AC_DEFUN([OMPI_INTERIX],[ AC_MSG_RESULT([$is_interix]) if test "$is_interix" = "yes"; then - ompi_show_subtitle "Interix detection" + opal_show_subtitle "Interix detection" if ! test -d /usr/include/port; then AC_MSG_WARN([Compiling Open MPI under Interix require an up-to-date]) diff --git a/config/ompi_mca.m4 b/config/ompi_mca.m4 index e59e7c72b1..488af644e1 100644 --- a/config/ompi_mca.m4 +++ b/config/ompi_mca.m4 @@ -253,7 +253,7 @@ AC_DEFUN([MCA_CONFIGURE_PROJECT],[ # can't use a variable rename here because these need to be evaled # at auto* time. - ompi_show_subtitle "Configuring MCA for $1" + opal_show_subtitle "Configuring MCA for $1" AC_MSG_CHECKING([for frameworks for $1]) AC_MSG_RESULT([mca_$1_framework_list]) diff --git a/config/ompi_microsoft.m4 b/config/ompi_microsoft.m4 index 3074929a5b..30e3e6582b 100644 --- a/config/ompi_microsoft.m4 +++ b/config/ompi_microsoft.m4 @@ -28,7 +28,7 @@ AC_DEFUN([OMPI_MICROSOFT_COMPILER],[ # default list of header files. if test "x$ompi_cv_c_compiler_vendor" = "xmicrosoft" ; then - ompi_show_subtitle "Microsoft specific detection" + opal_show_subtitle "Microsoft specific detection" # # These 2 libraries are a minimum ... @@ -106,7 +106,7 @@ AC_DEFUN([OMPI_MICROSOFT_COMPILER],[ $ompi_windows_have_support_for_64_bits_atomic, [Whether we support 64 bits atomic operations on Windows]) - ompi_show_title "Windows Type tests" + opal_show_title "Windows Type tests" AC_DEFINE([pid_t], [intptr_t], [Windows pid_t type is a pointer]) AC_DEFINE_UNQUOTED([SIZEOF_PID_T], $ac_cv_sizeof_int, diff --git a/config/ompi_setup_contrib.m4 b/config/ompi_setup_contrib.m4 index ea6735c7ef..eb14385065 100644 --- a/config/ompi_setup_contrib.m4 +++ b/config/ompi_setup_contrib.m4 @@ -23,7 +23,7 @@ # AC_DEFUN([OMPI_SETUP_CONTRIB],[ - ompi_show_title "Contributed software setup" + opal_show_title "Contributed software setup" OMPI_CONTRIB ]) diff --git a/config/ompi_setup_cxx.m4 b/config/ompi_setup_cxx.m4 index 2028ed06f7..53671e7c22 100644 --- a/config/ompi_setup_cxx.m4 +++ b/config/ompi_setup_cxx.m4 @@ -23,7 +23,7 @@ dnl # This macro is necessary to get the title to be displayed first. :-) AC_DEFUN([OMPI_SETUP_CXX_BANNER],[ - ompi_show_subtitle "C++ compiler and preprocessor" + opal_show_subtitle "C++ compiler and preprocessor" ]) # This macro is necessary because PROG_CXX* is REQUIREd by multiple diff --git a/config/ompi_setup_fc.m4 b/config/ompi_setup_fc.m4 index c3f8d148d1..d8bc8a718c 100644 --- a/config/ompi_setup_fc.m4 +++ b/config/ompi_setup_fc.m4 @@ -25,7 +25,7 @@ dnl # This is REQUIREd, below. AC_DEFUN_ONCE([_OMPI_SETUP_FC_BANNER],[ - ompi_show_subtitle "Fortran compiler" + opal_show_subtitle "Fortran compiler" ]) ############################################################################# diff --git a/config/ompi_setup_java.m4 b/config/ompi_setup_java.m4 index c20fcba2fb..53ac9962cd 100644 --- a/config/ompi_setup_java.m4 +++ b/config/ompi_setup_java.m4 @@ -23,7 +23,7 @@ dnl # This macro is necessary to get the title to be displayed first. :-) AC_DEFUN([OMPI_SETUP_JAVA_BINDINGS_BANNER],[ - ompi_show_subtitle "Java MPI bindings" + opal_show_subtitle "Java MPI bindings" ]) # OMPI_SETUP_JAVA_BINDINGS() diff --git a/config/ompi_setup_mpi_ext.m4 b/config/ompi_setup_mpi_ext.m4 index baca9f6142..9abfd9f60e 100644 --- a/config/ompi_setup_mpi_ext.m4 +++ b/config/ompi_setup_mpi_ext.m4 @@ -23,7 +23,7 @@ # AC_DEFUN([OMPI_SETUP_MPI_EXT],[ - ompi_show_title "Extended MPI interfaces setup" + opal_show_title "Extended MPI interfaces setup" OMPI_EXT ]) diff --git a/config/opal_configure_options.m4 b/config/opal_configure_options.m4 index 802093d8b9..ee6063cea4 100644 --- a/config/opal_configure_options.m4 +++ b/config/opal_configure_options.m4 @@ -27,7 +27,7 @@ dnl $HEADER$ dnl AC_DEFUN([OPAL_CONFIGURE_OPTIONS],[ -ompi_show_subtitle "OPAL Configuration options" +opal_show_subtitle "OPAL Configuration options" # diff --git a/config/opal_functions.m4 b/config/opal_functions.m4 index 9e68bcde4e..f6c7a71adc 100644 --- a/config/opal_functions.m4 +++ b/config/opal_functions.m4 @@ -42,7 +42,7 @@ AC_DEFUN([OPAL_CONFIGURE_SETUP],[ # of arugments here because of the m4 substitution. So we have to set # special variable names before invoking the function. :-\ -ompi_show_title() { +opal_show_title() { cat < and sysconf(), which is ok) OS X 10.4 has and @@ -1136,7 +1136,7 @@ OPAL_SETUP_FT # MCA ################################## -ompi_show_title "Modular Component Architecture (MCA) setup" +opal_show_title "Modular Component Architecture (MCA) setup" AC_MSG_CHECKING([for subdir args]) OMPI_CONFIG_SUBDIR_ARGS([ompi_subdir_args]) @@ -1174,7 +1174,7 @@ AC_CACHE_SAVE # Check the visibility declspec at the end to avoid problem with # the previous tests that are not necessarily prepared for # the visibility feature. -ompi_show_title "Symbol visibility feature" +opal_show_title "Symbol visibility feature" OPAL_CHECK_VISIBILITY @@ -1184,14 +1184,14 @@ OPAL_CHECK_VISIBILITY # Final top-level OMPI configuration ############################################################################ -ompi_show_title "Final top-level OMPI configuration" +opal_show_title "Final top-level OMPI configuration" ############################################################################ # Libtool: part two # (after C compiler setup = no compiler/linker tests after this) ############################################################################ -ompi_show_subtitle "Libtool configuration" +opal_show_subtitle "Libtool configuration" # Use the undocumented solaris_use_stlport4 libtool variable to turn off any # Cstd/stlport4 linkage. This allows Open MPI to be C++ STL agnostic. @@ -1257,8 +1257,8 @@ LT_OUTPUT # final compiler config ############################################################################ -m4_ifdef([project_ompi], [ompi_show_subtitle "Compiler flags"], - [m4_ifdef([project_orte], [ompi_show_subtitle "Compiler flags"])]) +m4_ifdef([project_ompi], [opal_show_subtitle "Compiler flags"], + [m4_ifdef([project_orte], [opal_show_subtitle "Compiler flags"])]) # # This is needed for VPATH builds, so that it will -I the appropriate @@ -1316,7 +1316,7 @@ AC_SUBST([AMCA_PARAM_SETS_DIR], ['$(ompidatadir)/amca-param-sets']) # final wrapper compiler config ############################################################################ -ompi_show_subtitle "Wrapper compiler final setup" +opal_show_subtitle "Wrapper compiler final setup" # The ORTE and OMPI wrapper scripts (i.e., not the C-compiled # executables) need perl. AC_PATH_PROG(PERL, perl, perl) @@ -1399,7 +1399,7 @@ AC_SUBST(ompidatadir) AC_SUBST(ompilibdir) AC_SUBST(ompiincludedir) -ompi_show_subtitle "Final output" +opal_show_subtitle "Final output" AC_CONFIG_FILES([ Makefile diff --git a/ompi/mca/io/romio/configure.m4 b/ompi/mca/io/romio/configure.m4 index 635158907b..dbce17f9e3 100644 --- a/ompi/mca/io/romio/configure.m4 +++ b/ompi/mca/io/romio/configure.m4 @@ -83,7 +83,7 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[ io_romio_flags="$io_romio_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg --disable-aio" - ompi_show_subtitle "Configuring ROMIO distribution" + opal_show_subtitle "Configuring ROMIO distribution" OMPI_CONFIG_SUBDIR([ompi/mca/io/romio/romio], [$io_romio_flags], [io_romio_happy=1], [io_romio_happy=0])