rename macros ompi_check_optflags and ompi_make_stripped_flags based on comments in #2072

This commit was SVN r22151.

config/ompi_ensure_contains_optflags.m4

@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2007 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) 2007-2008 Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
 dnl Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
@@ -19,7 +19,7 @@ dnl
 dnl $HEADER$
 dnl
 
-AC_DEFUN([OMPI_CHECK_OPTFLAGS],[
+AC_DEFUN([OMPI_ENSURE_CONTAINS_OPTFLAGS],[
 
 # Modularize this setup so that sub-configure.in scripts can use this
 # same setup code.

config/ompi_strip_optflags.m4

@@ -11,7 +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) 2008      Cisco Systems, Inc.  All rights reserved.
-dnl Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2008-2009 Sun Microsystems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -19,7 +19,7 @@ dnl
 dnl $HEADER$
 dnl
 
-AC_DEFUN([OMPI_MAKE_STRIPPED_FLAGS],[
+AC_DEFUN([OMPI_STRIP_OPTFLAGS],[
 
 # Process a set of flags and remove all debugging and optimization
 # flags

ompi/config/ompi_setup_cxx.m4

@@ -12,7 +12,7 @@ dnl Copyright (c) 2004-2006 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
 dnl                         reserved. 
-dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
 dnl Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
@@ -254,8 +254,8 @@ EOF
         fi
     fi
 
-    # config/ompi_check_optflags.m4
-    OMPI_CHECK_OPTFLAGS(["$CXXFLAGS"])
+    # config/ompi_ensure_contains_optflags.m4
+    OMPI_ENSURE_CONTAINS_OPTFLAGS(["$CXXFLAGS"])
     AC_MSG_CHECKING([for C++ optimization flags])
     AC_MSG_RESULT([$co_result])
     CXXFLAGS="$co_result"

opal/config/opal_setup_cc.m4

@@ -265,11 +265,11 @@ AC_DEFUN([OMPI_SETUP_CC],[
         fi
     fi
 
-    OMPI_CHECK_OPTFLAGS("$OMPI_CFLAGS_BEFORE_PICKY")
+    OMPI_ENSURE_CONTAINS_OPTFLAGS("$OMPI_CFLAGS_BEFORE_PICKY")
     OMPI_CFLAGS_BEFORE_PICKY="$co_result"
 
     AC_MSG_CHECKING([for C optimization flags])
-    OMPI_CHECK_OPTFLAGS(["$CFLAGS"])
+    OMPI_ENSURE_CONTAINS_OPTFLAGS(["$CFLAGS"])
     AC_MSG_RESULT([$co_result])
     CFLAGS="$co_result"
 ])

opal/config/opal_setup_cxx.m4

@@ -12,7 +12,7 @@ dnl Copyright (c) 2004-2006 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
 dnl                         reserved. 
-dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
 dnl Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
@@ -188,8 +188,8 @@ EOF
         fi
     fi
 
-    # config/opal_check_optflags.m4
-    OMPI_CHECK_OPTFLAGS(["$CXXFLAGS"])
+    # config/opal_ensure_contains_optflags.m4
+    OMPI_ENSURE_CONTAINS_OPTFLAGS(["$CXXFLAGS"])
     AC_MSG_CHECKING([for C++ optimization flags])
     AC_MSG_RESULT([$co_result])
     CXXFLAGS="$co_result"

orte/config/orte_setup_debugger_flags.m4

@@ -29,7 +29,7 @@ AC_DEFUN([ORTE_SETUP_DEBUGGER_FLAGS],[
     # debugger-sensitive files with -g and nothing else.
     #
 
-    OMPI_MAKE_STRIPPED_FLAGS($CFLAGS)
+    OMPI_STRIP_OPTFLAGS($CFLAGS)
     CFLAGS_WITHOUT_OPTFLAGS="$s_result"
     # Tweak the compiler flags passed to orterun for Sun Studio SPARC
     # https://svn.open-mpi.org/trac/ompi/ticket/1448