From 4f4d9dcd28839955367d09a9bb6cfbf9b99b392d Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 6 May 2014 19:22:27 +0000 Subject: [PATCH] Per RFC, continue with build system renaming This commit was SVN r31657. --- config/ompi_setup_cxx.m4 | 2 +- config/opal_check_func_lib.m4 | 15 ++++++------ config/opal_check_icc.m4 | 7 +++--- config/opal_check_ident.m4 | 46 +++++++++++++++++------------------ configure.ac | 4 +-- 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/config/ompi_setup_cxx.m4 b/config/ompi_setup_cxx.m4 index 14b920bab2..4f2b28c264 100644 --- a/config/ompi_setup_cxx.m4 +++ b/config/ompi_setup_cxx.m4 @@ -51,7 +51,7 @@ AC_DEFUN([OMPI_SETUP_CXX],[ AS_IF([test "$WANT_MPI_CXX_SUPPORT" = "1"], [OMPI_CXX_FIND_TEMPLATE_REPOSITORY OMPI_CXX_FIND_TEMPLATE_PARAMETERS - OMPI_CHECK_IDENT([CXX], [CXXFLAGS], [cc], [C++])]) + OPAL_CHECK_IDENT([CXX], [CXXFLAGS], [cc], [C++])]) _OMPI_CXX_CHECK_BUILTIN diff --git a/config/opal_check_func_lib.m4 b/config/opal_check_func_lib.m4 index 3069f1787e..621ff0e01a 100644 --- a/config/opal_check_func_lib.m4 +++ b/config/opal_check_func_lib.m4 @@ -11,6 +11,7 @@ dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2014 Intel, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -27,24 +28,24 @@ dnl # LIBS is not modified. AC_DEFUN([OPAL_CHECK_FUNC_LIB],[ OPAL_VAR_SCOPE_PUSH([LIBS_save]) - AS_VAR_PUSHDEF([ompi_var], [ompi_cv_func_lib_$1_$2])dnl + AS_VAR_PUSHDEF([opal_var], [opal_cv_func_lib_$1_$2])dnl AC_CACHE_CHECK([if we need -l$2 for $1], - ompi_var, + opal_var, [AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])], - [AS_VAR_SET(ompi_var, "no")], + [AS_VAR_SET(opal_var, "no")], [LIBS_save="$LIBS" LIBS="$LIBS -l$2" AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])], - [AS_VAR_SET(ompi_var, "yes")], - [AS_VAR_SET(ompi_var, "not found")]) + [AS_VAR_SET(opal_var, "yes")], + [AS_VAR_SET(opal_var, "not found")]) LIBS="$LIBS_save"])]) - AS_VAR_IF(ompi_var, [yes], + AS_VAR_IF(opal_var, [yes], [LIBS="$LIBS -l$2"]) # see if we actually have $1. Use AC_CHECK_FUNCS so that it # does the glibc "not implemented" check. Will use the current LIBS, # so will check in -l$2 if we decided we needed it above AC_CHECK_FUNCS([$1], $3, $4) - AS_VAR_POPDEF([ompi_var])dnl + AS_VAR_POPDEF([opal_var])dnl OPAL_VAR_SCOPE_POP ]) diff --git a/config/opal_check_icc.m4 b/config/opal_check_icc.m4 index f6f403a5a5..08502ea3d1 100644 --- a/config/opal_check_icc.m4 +++ b/config/opal_check_icc.m4 @@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. +dnl Copyright (c) 2014 Intel, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -17,7 +18,7 @@ dnl dnl $HEADER$ dnl -AC_DEFUN([OMPI_CHECK_ICC_VARARGS],[ +AC_DEFUN([OPAL_CHECK_ICC_VARARGS],[ dnl dnl On EM64T, icc-8.1 before version 8.1.027 segfaulted, since dnl va_start was miscompiled... @@ -45,9 +46,9 @@ int main () return 0; } -],[ompi_ac_icc_varargs=`test -f conftestval`],[ompi_ac_icc_varargs=1],[ompi_ac_icc_varargs=1]) +],[opal_ac_icc_varargs=`test -f conftestval`],[opal_ac_icc_varargs=1],[opal_ac_icc_varargs=1]) -if test "$ompi_ac_icc_varargs" = "1"; then +if test "$opal_ac_icc_varargs" = "1"; then AC_MSG_WARN([*** Problem running configure test!]) AC_MSG_WARN([*** Your icc-8.1 compiler seems to miscompile va_start!]) AC_MSG_WARN([*** Please upgrade compiler to at least version 8.1.027]) diff --git a/config/opal_check_ident.m4 b/config/opal_check_ident.m4 index d1479cbf7a..28d66391f5 100644 --- a/config/opal_check_ident.m4 +++ b/config/opal_check_ident.m4 @@ -13,34 +13,34 @@ dnl OPAL_$1_USE_IDENT dnl OPAL_$1_USE_CONST_CHAR_IDENT dnl -# OMPI_CHECK_IDENT(compiler-env, compiler-flags, +# OPAL_CHECK_IDENT(compiler-env, compiler-flags, # file-suffix, lang) Try to compile a source file containing # a #pragma ident, and determine whether the ident was # inserted into the resulting object file # ----------------------------------------------------------- -AC_DEFUN([OMPI_CHECK_IDENT], [ +AC_DEFUN([OPAL_CHECK_IDENT], [ AC_MSG_CHECKING([for $4 ident string support]) opal_pragma_ident_happy=0 opal_ident_happy=0 opal_static_const_char_happy=0 - _OMPI_CHECK_IDENT( + _OPAL_CHECK_IDENT( [$1], [$2], [$3], [[#]pragma ident], [], [opal_pragma_ident_happy=1 - ompi_message="[#]pragma ident"], - _OMPI_CHECK_IDENT( + opal_message="[#]pragma ident"], + _OPAL_CHECK_IDENT( [$1], [$2], [$3], [[#]ident], [], [opal_ident_happy=1 - ompi_message="[#]ident"], - _OMPI_CHECK_IDENT( + opal_message="[#]ident"], + _OPAL_CHECK_IDENT( [$1], [$2], [$3], [[#]pragma comment(exestr, ], [)], [opal_pragma_comment_happy=1 - ompi_message="[#]pragma comment"], + opal_message="[#]pragma comment"], [opal_static_const_char_happy=1 - ompi_message="static const char[[]]"]))) + opal_message="static const char[[]]"]))) AC_DEFINE_UNQUOTED([OPAL_$1_USE_PRAGMA_IDENT], [$opal_pragma_ident_happy], [Use #pragma ident strings for $4 files]) @@ -51,24 +51,24 @@ AC_DEFUN([OMPI_CHECK_IDENT], [ AC_DEFINE_UNQUOTED([OPAL_$1_USE_CONST_CHAR_IDENT], [$opal_static_const_char_happy], [Use static const char[] strings for $4 files]) - AC_MSG_RESULT([$ompi_message]) + AC_MSG_RESULT([$opal_message]) - unset opal_pragma_ident_happy opal_ident_happy opal_static_const_char_happy ompi_message + unset opal_pragma_ident_happy opal_ident_happy opal_static_const_char_happy opal_message ]) -# _OMPI_CHECK_IDENT(compiler-env, compiler-flags, +# _OPAL_CHECK_IDENT(compiler-env, compiler-flags, # file-suffix, header_prefix, header_suffix, action-if-success, action-if-fail) # Try to compile a source file containing a #-style ident, # and determine whether the ident was inserted into the # resulting object file # ----------------------------------------------------------- -AC_DEFUN([_OMPI_CHECK_IDENT], [ - eval ompi_compiler="\$$1" - eval ompi_flags="\$$2" +AC_DEFUN([_OPAL_CHECK_IDENT], [ + eval opal_compiler="\$$1" + eval opal_flags="\$$2" - ompi_ident="string_not_coincidentally_inserted_by_the_compiler" + opal_ident="string_not_coincidentally_inserted_by_the_compiler" cat > conftest.$3 <&1 1>/dev/null - ompi_status=$? - AS_IF([test "$ompi_output" != "" -o "$ompi_status" = "0"], + [opal_output="`strings -a conftest.${OBJEXT} | grep $opal_ident`" + grep $opal_ident conftest.${OBJEXT} 2>&1 1>/dev/null + opal_status=$? + AS_IF([test "$opal_output" != "" -o "$opal_status" = "0"], [$6], [$7])], [OPAL_LOG_MSG([the failed program was:]) @@ -92,6 +92,6 @@ EOF $7] [$7])]) - unset ompi_compiler ompi_flags ompi_output ompi_status + unset opal_compiler opal_flags opal_output opal_status rm -rf conftest.* conftest${EXEEXT} ])dnl diff --git a/configure.ac b/configure.ac index 6aaef2fd0a..21d1444668 100644 --- a/configure.ac +++ b/configure.ac @@ -339,7 +339,7 @@ OMPI_INTERIX # Does the compiler support "ident"-like constructs? -OMPI_CHECK_IDENT([CC], [CFLAGS], [c], [C]) +OPAL_CHECK_IDENT([CC], [CFLAGS], [c], [C]) # # Check for some types @@ -520,7 +520,7 @@ fi OPAL_VAR_SCOPE_POP if test "x$CC" = "xicc"; then - OMPI_CHECK_ICC_VARARGS + OPAL_CHECK_ICC_VARARGS fi # If we want the profiling layer: