1
1

Per RFC, continue the renaming effort

This commit was SVN r31664.
This commit is contained in:
Ralph Castain 2014-05-06 21:16:29 +00:00
parent fdfb331e13
commit 839c0eb55c
7 changed files with 18 additions and 13 deletions

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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])

View File

@ -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

View File

@ -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,

View File

@ -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