Rename "libtrace" to be "libompitrace" so as not to conflict with an

already-existing "libtrace" on some BSD distros.

This commit was SVN r23357.

config/ompi_contrib.m4

@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 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 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
 dnl Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
@@ -38,7 +38,7 @@ AC_DEFUN([OMPI_CONTRIB],[
     # May someday be expanded to have autogen find the packages
     # instead of this hard-coded list
     # (https://svn.open-mpi.org/trac/ompi/ticket/1162).
-    m4_define([contrib_software_list], [libtrace, vt])
+    m4_define([contrib_software_list], [libompitrace, vt])
 
     # Option to not build some of the contributed software packages
     AC_ARG_ENABLE([contrib-no-build],

ompi/contrib/libompitrace/Makefile.am

@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -18,9 +18,9 @@
 # $HEADER$
 #
 
-lib_LTLIBRARIES = libtrace.la
+lib_LTLIBRARIES = libompitrace.la
 
-libtrace_la_SOURCES = \
+libompitrace_la_SOURCES = \
         abort.c \
         accumulate.c \
         add_error_class.c \

ompi/contrib/libompitrace/configure.m4

@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -18,9 +18,9 @@
 # $HEADER$
 #
 
-# OMPI_contrib_libtrace_CONFIG([action-if-can-compile], 
-#                              [action-if-cant-compile])
+# OMPI_contrib_libompitrace_CONFIG([action-if-can-compile], 
+#                                  [action-if-cant-compile])
 # ------------------------------------------------
-AC_DEFUN([OMPI_contrib_libtrace_CONFIG],[
+AC_DEFUN([OMPI_contrib_libompitrace_CONFIG],[
     $1
 ])dnl