Terry pointed out that ORTE also needs the "totalview" flags, and

therefore the m4 test really belongs on orte/config.  Thank Terry!

Additionally, I took the opprotunity to rename the variable so that
"TOTALVIEW" is not in the name anymore (because it applies to all
variables, not just Totalview).

This commit was SVN r22134.

configure.ac

@@ -1110,10 +1110,11 @@ else
     m4_ifdef([project_ompi], [CXXCPPFLAGS='-I$(top_srcdir)'" $CXXCPPFLAGS"])
 fi
 
-# OMPI wants some additional processing of the flags (e.g., get
+# OMPI/ORTE wants some additional processing of the flags (e.g., get
 # versions without optimization for debugger modules).
 
-m4_ifdef([project_ompi], [OMPI_SETUP_DEBUGGER_FLAGS])
+m4_ifdef([project_orte], [ORTE_SETUP_DEBUGGER_FLAGS],
+         [m4_ifdef([project_ompi], [ORTE_SETUP_DEBUGGER_FLAGS])])
 
 #
 # Delayed the substitution of CFLAGS and CXXFLAGS until now because

ompi/debuggers/Makefile.am

@@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2007-2008 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -27,7 +27,7 @@ pkglib_LTLIBRARIES = libompi_dbg_msgq.la
 # post-processed forms of the CFLAGS in the library targets down
 # below.
 
-CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(TOTALVIEW_DEBUG_FLAGS)
+CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS)
 
 # Source code files
 

orte/config/orte_setup_debugger_flags.m4

@@ -22,31 +22,27 @@
 # $HEADER$
 #
 
-AC_DEFUN([OMPI_SETUP_DEBUGGER_FLAGS],[
+AC_DEFUN([ORTE_SETUP_DEBUGGER_FLAGS],[
     #
-    # Do a final process of the CFLAGS to make a WITHOUT_OPTFLAGS version.
-    # We need this so that we can guarantee to build the TotalView stuff
-    # with -g and nothing else.
+    # Do a final process of the CFLAGS to make a WITHOUT_OPTFLAGS
+    # version.  We need this so that we can guarantee to build the
+    # debugger-sensitive files with -g and nothing else.
     #
-    
+
     OMPI_MAKE_STRIPPED_FLAGS($CFLAGS)
     CFLAGS_WITHOUT_OPTFLAGS="$s_result"
-    if test "$with_tv_debug_flags" != ""; then
-        TOTALVIEW_DEBUG_FLAGS="$with_tv_debug_flags"
+    # Tweak the compiler flags passed to orterun for Sun Studio SPARC
+    # https://svn.open-mpi.org/trac/ompi/ticket/1448
+    if test "x$ompi_cv_c_compiler_vendor" = "xsun" -a -n "`echo $host | $GREP sparc`"; then
+        DEBUGGER_CFLAGS="-g -xO0"
     else
-        # Tweak the compiler flags passed to orterun for Sun Studio SPARC
-        # https://svn.open-mpi.org/trac/ompi/ticket/1448
-        if test "x$ompi_cv_c_compiler_vendor" = "xsun" -a -n "`echo $host | $GREP sparc`"; then
-            TOTALVIEW_DEBUG_FLAGS="-g -xO0"
-        else
-            TOTALVIEW_DEBUG_FLAGS="-g"
-        fi
+        DEBUGGER_CFLAGS="-g"
     fi
-    AC_MSG_CHECKING([which of CFLAGS are ok for TotalView modules])
+    AC_MSG_CHECKING([which of CFLAGS are ok for debugger modules])
     AC_MSG_RESULT([$CFLAGS_WITHOUT_OPTFLAGS])
-    AC_MSG_CHECKING([extra CFLAGS for TotalView modules])
-    AC_MSG_RESULT([$TOTALVIEW_DEBUG_FLAGS])
+    AC_MSG_CHECKING([for debugger extra CFLAGS])
+    AC_MSG_RESULT([$DEBUGGER_CFLAGS])
     
     AC_SUBST(CFLAGS_WITHOUT_OPTFLAGS)
-    AC_SUBST(TOTALVIEW_DEBUG_FLAGS)
+    AC_SUBST(DEBUGGER_CFLAGS)
 ])

orte/tools/orterun/Makefile.am

@@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
@@ -25,7 +25,7 @@
 # post-processed forms of the CFLAGS in the library targets down
 # below.
 
-CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(TOTALVIEW_DEBUG_FLAGS)
+CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS)
 
 include $(top_srcdir)/Makefile.man-page-rules