Per RFC:
ompi_show_title -> opal_show_title ompi_show_subtitle -> opal_show_subtitle This commit was SVN r31638.
Этот коммит содержится в:
родитель
a1ae20fddb
Коммит
29609577d5
@ -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?
|
||||
|
@ -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])
|
||||
|
@ -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])
|
||||
|
@ -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])
|
||||
|
@ -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,
|
||||
|
@ -23,7 +23,7 @@
|
||||
#
|
||||
|
||||
AC_DEFUN([OMPI_SETUP_CONTRIB],[
|
||||
ompi_show_title "Contributed software setup"
|
||||
opal_show_title "Contributed software setup"
|
||||
|
||||
OMPI_CONTRIB
|
||||
])
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
])
|
||||
|
||||
#############################################################################
|
||||
|
@ -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()
|
||||
|
@ -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
|
||||
])
|
||||
|
@ -27,7 +27,7 @@ dnl $HEADER$
|
||||
dnl
|
||||
|
||||
AC_DEFUN([OPAL_CONFIGURE_OPTIONS],[
|
||||
ompi_show_subtitle "OPAL Configuration options"
|
||||
opal_show_subtitle "OPAL Configuration options"
|
||||
|
||||
|
||||
#
|
||||
|
@ -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 <<EOF
|
||||
|
||||
============================================================================
|
||||
@ -53,7 +53,7 @@ EOF
|
||||
}
|
||||
|
||||
|
||||
ompi_show_subtitle() {
|
||||
opal_show_subtitle() {
|
||||
cat <<EOF
|
||||
|
||||
*** ${1}
|
||||
|
@ -325,7 +325,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
|
||||
|
||||
|
||||
AC_DEFUN([_OMPI_START_SETUP_CC],[
|
||||
ompi_show_subtitle "C compiler and preprocessor"
|
||||
opal_show_subtitle "C compiler and preprocessor"
|
||||
|
||||
# $%@#!@#% AIX!! This has to be called before anything invokes the C
|
||||
# compiler.
|
||||
|
@ -23,7 +23,7 @@ dnl
|
||||
|
||||
# This macro is necessary to get the title to be displayed first. :-)
|
||||
AC_DEFUN([OPAL_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
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
# This macro is necessary to get the title to be displayed first. :-)
|
||||
AC_DEFUN([OPAL_SETUP_FT_BANNER],[
|
||||
ompi_show_subtitle "Fault tolerance"
|
||||
opal_show_subtitle "Fault tolerance"
|
||||
])
|
||||
|
||||
AC_DEFUN([OPAL_SETUP_FT_OPTIONS],[
|
||||
|
@ -24,7 +24,7 @@ dnl
|
||||
|
||||
# This macro is necessary to get the title to be displayed first. :-)
|
||||
AC_DEFUN([OPAL_SETUP_JAVA_BANNER],[
|
||||
ompi_show_subtitle "Java compiler"
|
||||
opal_show_subtitle "Java compiler"
|
||||
])
|
||||
|
||||
# OPAL_SETUP_JAVA()
|
||||
|
@ -24,7 +24,7 @@ dnl
|
||||
AC_DEFUN([OPAL_SETUP_LIBLTDL],[
|
||||
OPAL_VAR_SCOPE_PUSH([HAPPY])
|
||||
|
||||
ompi_show_subtitle "GNU libltdl setup"
|
||||
opal_show_subtitle "GNU libltdl setup"
|
||||
|
||||
# AC_CONFIG_SUBDIRS appears to be broken for non-gcc compilers (i.e.,
|
||||
# passing precious variables down to the sub-configure).
|
||||
|
@ -26,7 +26,7 @@ dnl
|
||||
|
||||
|
||||
AC_DEFUN([ORTE_CONFIGURE_OPTIONS],[
|
||||
ompi_show_subtitle "ORTE Configuration options"
|
||||
opal_show_subtitle "ORTE Configuration options"
|
||||
|
||||
#
|
||||
# Do we want orterun's --prefix behavior to be enabled by default?
|
||||
|
@ -23,7 +23,7 @@ dnl
|
||||
|
||||
# This macro is necessary to get the title to be displayed first. :-)
|
||||
AC_DEFUN([ORTE_SETUP_JAVA_BANNER],[
|
||||
ompi_show_subtitle "Java compiler"
|
||||
opal_show_subtitle "Java compiler"
|
||||
])
|
||||
|
||||
# ORTE_SETUP_JAVA()
|
||||
|
@ -11,7 +11,7 @@ dnl $HEADER$
|
||||
dnl
|
||||
|
||||
AC_DEFUN([OSHMEM_CONFIGURE_OPTIONS],[
|
||||
ompi_show_subtitle "OSHMEM Configuration options"
|
||||
opal_show_subtitle "OSHMEM Configuration options"
|
||||
|
||||
AC_SUBST(OSHMEM_LIBSHMEM_EXTRA_LIBS)
|
||||
AC_SUBST(OSHMEM_LIBSHMEM_EXTRA_LDFLAGS)
|
||||
|
38
configure.ac
38
configure.ac
@ -62,13 +62,13 @@ OMPI_LOAD_PLATFORM
|
||||
#
|
||||
|
||||
OPAL_CONFIGURE_SETUP
|
||||
ompi_show_title "Configuring project_name_long"
|
||||
opal_show_title "Configuring project_name_long"
|
||||
|
||||
#
|
||||
# Setup some things that must be done before AM-INIT-AUTOMAKE
|
||||
#
|
||||
|
||||
ompi_show_subtitle "Startup tests"
|
||||
opal_show_subtitle "Startup tests"
|
||||
AC_CANONICAL_HOST
|
||||
AC_CANONICAL_TARGET
|
||||
AC_DEFINE_UNQUOTED(OPAL_ARCH, "$target", [OMPI architecture string])
|
||||
@ -100,7 +100,7 @@ AM_SILENT_RULES([yes])
|
||||
# Make configure depend on the VERSION file, since it's used in AC_INIT
|
||||
AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
|
||||
|
||||
ompi_show_subtitle "Checking versions"
|
||||
opal_show_subtitle "Checking versions"
|
||||
|
||||
# Get the version of OMPI that we are installing
|
||||
|
||||
@ -187,7 +187,7 @@ PACKAGE_VERSION="$OPAL_VERSION"
|
||||
PACKAGE_STRING="${PACKAGE_NAME} ${PACKAGE_VERSION}"
|
||||
VERSION="${PACKAGE_VERSION}"
|
||||
|
||||
ompi_show_subtitle "Initialization, setup"
|
||||
opal_show_subtitle "Initialization, setup"
|
||||
|
||||
OMPI_TOP_BUILDDIR="`pwd`"
|
||||
AC_SUBST(OMPI_TOP_BUILDDIR)
|
||||
@ -321,7 +321,7 @@ esac
|
||||
############################################################################
|
||||
# Check for compilers and preprocessors
|
||||
############################################################################
|
||||
ompi_show_title "Compiler and preprocessor tests"
|
||||
opal_show_title "Compiler and preprocessor tests"
|
||||
|
||||
##################################
|
||||
# C compiler characteristics
|
||||
@ -565,7 +565,7 @@ m4_ifdef([project_ompi], [OPAL_SETUP_CXX
|
||||
# C and C++ check compiler attributes.
|
||||
##################################
|
||||
|
||||
ompi_show_subtitle "Compiler characteristics"
|
||||
opal_show_subtitle "Compiler characteristics"
|
||||
|
||||
OPAL_CHECK_ATTRIBUTES
|
||||
OPAL_CHECK_COMPILER_VERSION_ID
|
||||
@ -596,7 +596,7 @@ m4_ifdef([project_ompi], [OMPI_SETUP_MPI_PROFILING],
|
||||
# Assembler Configuration
|
||||
##################################
|
||||
|
||||
ompi_show_subtitle "Assembler"
|
||||
opal_show_subtitle "Assembler"
|
||||
|
||||
AM_PROG_AS
|
||||
OPAL_CONFIG_ASM
|
||||
@ -621,7 +621,7 @@ AC_CACHE_SAVE
|
||||
# Header files
|
||||
##################################
|
||||
|
||||
ompi_show_title "Header file tests"
|
||||
opal_show_title "Header file tests"
|
||||
|
||||
AC_CHECK_HEADERS([alloca.h aio.h arpa/inet.h dirent.h \
|
||||
dlfcn.h execinfo.h err.h fcntl.h grp.h inttypes.h libgen.h \
|
||||
@ -706,7 +706,7 @@ AC_CACHE_SAVE
|
||||
# Types
|
||||
##################################
|
||||
|
||||
ompi_show_title "Type tests"
|
||||
opal_show_title "Type tests"
|
||||
|
||||
AC_CHECK_TYPES([socklen_t, struct sockaddr_in, struct sockaddr_in6,
|
||||
struct sockaddr_storage],
|
||||
@ -835,7 +835,7 @@ AC_CACHE_SAVE
|
||||
# Libraries
|
||||
##################################
|
||||
|
||||
ompi_show_title "Library and Function tests"
|
||||
opal_show_title "Library and Function tests"
|
||||
|
||||
# Darwin doesn't need -lutil, as it's something other than this -lutil.
|
||||
OPAL_CHECK_FUNC_LIB([openpty], [util])
|
||||
@ -910,7 +910,7 @@ AC_CACHE_SAVE
|
||||
# System-specific tests
|
||||
##################################
|
||||
|
||||
ompi_show_title "System-specific tests"
|
||||
opal_show_title "System-specific tests"
|
||||
|
||||
# Do we have _SC_NPROCESSORS_ONLN? (only going to pass if we also have
|
||||
# <unistd.h> and sysconf(), which is ok) OS X 10.4 has <unistd.h> 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
|
||||
|
@ -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])
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user