From 839c0eb55c774f071f4a00f86ed849b3d907a2c6 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 6 May 2014 21:16:29 +0000 Subject: [PATCH] Per RFC, continue the renaming effort This commit was SVN r31664. --- config/opal_check_compiler_works.m4 | 3 ++- config/opal_check_ps.m4 | 3 ++- config/opal_config_pthreads.m4 | 6 +++--- config/opal_config_threads.m4 | 3 ++- config/opal_load_platform.m4 | 9 +++++---- config/opal_setup_component_package.m4 | 3 ++- configure.ac | 4 ++-- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/config/opal_check_compiler_works.m4 b/config/opal_check_compiler_works.m4 index 95023d3695..7c5fcbe324 100644 --- a/config/opal_check_compiler_works.m4 +++ b/config/opal_check_compiler_works.m4 @@ -6,6 +6,7 @@ dnl Corporation. All rights reserved. dnl Copyright (c) 2006 Los Alamos National Security, LLC. All rights dnl reserved. dnl Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2014 Intel, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -27,7 +28,7 @@ dnl # a clean exit from the application (e.g., "return 0" in C/C++, empty in # fortran). AC_DEFUN([OPAL_CHECK_COMPILER_WORKS], -[ AS_VAR_PUSHDEF([lang_var], [ompi_cv_$1_works]) +[ AS_VAR_PUSHDEF([lang_var], [opal_cv_$1_works]) AC_CACHE_CHECK([if $1 compiler works], lang_var, [AC_LANG_PUSH($1) diff --git a/config/opal_check_ps.m4 b/config/opal_check_ps.m4 index 03a34848a4..014cdfec9d 100644 --- a/config/opal_check_ps.m4 +++ b/config/opal_check_ps.m4 @@ -12,6 +12,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2014 Intel, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -23,7 +24,7 @@ dnl # interested in. If so, then save it away. Otherwise, the string is # set to unknown. -AC_DEFUN([OMPI_PS_FLAVOR_CHECK],[ +AC_DEFUN([OPAL_PS_FLAVOR_CHECK],[ AC_MSG_CHECKING([for flavor of ps to use]) PS_FLAVOR="unknown" ps -A -o fname > /dev/null 2>&1 diff --git a/config/opal_config_pthreads.m4 b/config/opal_config_pthreads.m4 index cc88fbb159..51edffa9fc 100644 --- a/config/opal_config_pthreads.m4 +++ b/config/opal_config_pthreads.m4 @@ -16,14 +16,14 @@ dnl Additional copyrights may follow dnl dnl $HEADER$ dnl -dnl OMPI_CONFIG_POSIX_THREADS() +dnl OPAL_CONFIG_POSIX_THREADS() dnl dnl Configure posix threads, setting the following variables (but dnl not calling AC_SUBST on them). # ******************************************************************** # -# Internal macros - do not call from outside OMPI_CONFIG_POSIX_THREADS +# Internal macros - do not call from outside OPAL_CONFIG_POSIX_THREADS # # ******************************************************************** @@ -645,7 +645,7 @@ AC_PROVIDE_IFELSE([AC_PROG_FC], # External macro (aka, the real thing) # #******************************************************************** -AC_DEFUN([OMPI_CONFIG_POSIX_THREADS],[ +AC_DEFUN([OPAL_CONFIG_POSIX_THREADS],[ AC_REQUIRE([AC_PROG_GREP]) ompi_pthread_c_success=0 diff --git a/config/opal_config_threads.m4 b/config/opal_config_threads.m4 index 02831c13c4..80c2042649 100644 --- a/config/opal_config_threads.m4 +++ b/config/opal_config_threads.m4 @@ -11,6 +11,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved. +dnl Copyright (c) 2014 Intel, Inc. All rights reserved dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -37,7 +38,7 @@ AH_TEMPLATE([OPAL_HAVE_POSIX_THREADS], # # Check for thread types - add your type here... # -OMPI_CONFIG_POSIX_THREADS(HAVE_POSIX_THREADS=1, HAVE_POSIX_THREADS=0) +OPAL_CONFIG_POSIX_THREADS(HAVE_POSIX_THREADS=1, HAVE_POSIX_THREADS=0) AC_MSG_CHECKING([for working POSIX threads package]) if test "$HAVE_POSIX_THREADS" = "1" ; then AC_MSG_RESULT([yes]) diff --git a/config/opal_load_platform.m4 b/config/opal_load_platform.m4 index a73e200d1f..5d82c62ade 100644 --- a/config/opal_load_platform.m4 +++ b/config/opal_load_platform.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2014 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -17,9 +18,9 @@ # $HEADER$ # -# OMPI_LOAD_PLATFORM() +# OPAL_LOAD_PLATFORM() # -------------------- -AC_DEFUN([OMPI_LOAD_PLATFORM], [ +AC_DEFUN([OPAL_LOAD_PLATFORM], [ AC_ARG_WITH([platform], [AC_HELP_STRING([--with-platform=FILE], [Load options for build from FILE. Options on the @@ -64,8 +65,8 @@ AC_DEFUN([OMPI_LOAD_PLATFORM], [ . ./"$platform_file" # see if they left us a name - if test "$OMPI_PLATFORM_LOADED" != "" ; then - platform_loaded="$OMPI_PLATFORM_LOADED" + if test "$OPAL_PLATFORM_LOADED" != "" ; then + platform_loaded="$OPAL_PLATFORM_LOADED" else platform_loaded="$with_platform" fi diff --git a/config/opal_setup_component_package.m4 b/config/opal_setup_component_package.m4 index 7710ef83d3..723a6f5d85 100644 --- a/config/opal_setup_component_package.m4 +++ b/config/opal_setup_component_package.m4 @@ -11,6 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2014 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -18,7 +19,7 @@ # $HEADER$ # -# OMPI_SETUP_COMPONENT_PACKAGE(1: framework_name, +# OPAL_SETUP_COMPONENT_PACKAGE(1: framework_name, # 2: component_name, # 3: option_name, # 4: withdir_dir_check_file, diff --git a/configure.ac b/configure.ac index 21d1444668..baeeac93cd 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ AC_CONFIG_MACRO_DIR(config) # Get our platform support file. This has to be done very, very early # because it twiddles random bits of autoconf -OMPI_LOAD_PLATFORM +OPAL_LOAD_PLATFORM # # Start it up @@ -1024,7 +1024,7 @@ fi # # Look for ps command and arguments for orte-clean # -m4_ifdef([project_orte], [OMPI_PS_FLAVOR_CHECK]) +m4_ifdef([project_orte], [OPAL_PS_FLAVOR_CHECK]) # # File system case sensitivity