From 36ca7497d166640876d5bd6e424366a9045db2d1 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Wed, 12 Jul 2006 20:55:39 +0000
Subject: [PATCH] Update m4 and configure files

This commit was SVN r10764.
---
 orte/mca/pls/tbird/configure.m4      | 19 ++++++++++---------
 orte/mca/pls/tbird/configure.params  |  3 ++-
 orte/mca/rmgr/tbird/configure.params |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/orte/mca/pls/tbird/configure.m4 b/orte/mca/pls/tbird/configure.m4
index d1133fca6a..efc08a5f96 100644
--- a/orte/mca/pls/tbird/configure.m4
+++ b/orte/mca/pls/tbird/configure.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) 2006      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,21 +18,21 @@
 # $HEADER$
 #
 
-# MCA_pls_tm_CONFIG([action-if-found], [action-if-not-found])
+# MCA_pls_tbird_CONFIG([action-if-found], [action-if-not-found])
 # -----------------------------------------------------------
-AC_DEFUN([MCA_pls_tm_CONFIG],[
-    OMPI_CHECK_TM([pls_tm], [pls_tm_good=1], [pls_tm_good=0])
+AC_DEFUN([MCA_pls_tbird_CONFIG],[
+    OMPI_CHECK_TM([pls_tbird], [pls_tbird_good=1], [pls_tbird_good=0])
          
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
-    AS_IF([test "$pls_tm_good" = "1"],
-          [pls_tm_WRAPPER_EXTRA_LDFLAGS="$pls_tm_LDFLAGS"
-           pls_tm_WRAPPER_EXTRA_LIBS="$pls_tm_LIBS"
+    AS_IF([test "$pls_tbird_good" = "1"],
+          [pls_tbird_WRAPPER_EXTRA_LDFLAGS="$pls_tbird_LDFLAGS"
+           pls_tbird_WRAPPER_EXTRA_LIBS="$pls_tbird_LIBS"
            $1],
           [$2])
 
     # set build flags to use in makefile
-    AC_SUBST([pls_tm_CPPFLAGS])
-    AC_SUBST([pls_tm_LDFLAGS])
-    AC_SUBST([pls_tm_LIBS])
+    AC_SUBST([pls_tbird_CPPFLAGS])
+    AC_SUBST([pls_tbird_LDFLAGS])
+    AC_SUBST([pls_tbird_LIBS])
 ])dnl
diff --git a/orte/mca/pls/tbird/configure.params b/orte/mca/pls/tbird/configure.params
index 10b46bf7c1..39549177b2 100644
--- a/orte/mca/pls/tbird/configure.params
+++ b/orte/mca/pls/tbird/configure.params
@@ -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) 2006      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +18,5 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=src/pls_tm_component.c
+PARAM_INIT_FILE=src/pls_tbird_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rmgr/tbird/configure.params b/orte/mca/rmgr/tbird/configure.params
index a8a3147a0b..0a16796629 100644
--- a/orte/mca/rmgr/tbird/configure.params
+++ b/orte/mca/rmgr/tbird/configure.params
@@ -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) 2006      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +20,5 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=rmgr_urm.c
-PARAM_CONFIG_HEADER_FILE="urm_config.h"
+PARAM_INIT_FILE=rmgr_tbird.c
 PARAM_CONFIG_FILES="Makefile"