Added workaround for libtool bug:

Renamed internal library 'libutil' to avoid name conflicts with library dependencies (e.g. libutil of libc-dev)

This commit was SVN r24799.

ompi/contrib/vt/vt/tools/vtcpcavail/Makefile.am

@@ -8,9 +8,9 @@ vtcpcavail_SOURCES = \
 	vt_cpcavail.c
 
 vtcpcavail_LDADD = \
-	$(top_builddir)/util/libutil.la \
+	$(top_builddir)/util/libvt_util.la \
 	$(CPCLIBDIR) $(CPCLIB)
 
 vtcpcavail_DEPENDENCIES = \
-	$(top_builddir)/util/libutil.la
+	$(top_builddir)/util/libvt_util.la
 

ompi/contrib/vt/vt/tools/vtfilter/Makefile.am

@@ -32,10 +32,10 @@ vtfilter_SOURCES = \
 	vt_tracefilter.cc
 
 vtfilter_LDADD = \
-	$(top_builddir)/util/libutil.la \
+	$(top_builddir)/util/libvt_util.la \
 	$(OTFLIBRARY)
 
 vtfilter_DEPENDENCIES = \
-	$(top_builddir)/util/libutil.la \
+	$(top_builddir)/util/libvt_util.la \
 	$(OTFDEPENDENCIES)
 

ompi/contrib/vt/vt/tools/vtunify/Makefile.am

@@ -63,10 +63,10 @@ vtunify_SOURCES = \
 	vt_unify_tkfac.cc
 
 vtunify_LDADD = \
-	$(top_builddir)/util/libutil.la \
+	$(top_builddir)/util/libvt_util.la \
 	$(OTFLIBRARY) $(ETIMESYNCLIBRARY)
 
 vtunify_DEPENDENCIES = \
-	$(top_builddir)/util/libutil.la \
+	$(top_builddir)/util/libvt_util.la \
 	$(OTFDEPENDENCIES)
 

ompi/contrib/vt/vt/tools/vtunify/mpi/Makefile.am

@@ -65,11 +65,11 @@ vtunify_mpi_SOURCES = \
 	../vt_unify_tkfac.cc
 
 vtunify_mpi_LDADD = \
-	$(top_builddir)/util/libutil.la \
+	$(top_builddir)/util/libvt_util.la \
 	$(OTFLIBRARY) $(ETIMESYNCLIBRARY) \
 	$(MPILIBDIR) $(MPILIB)
 
 vtunify_mpi_DEPENDENCIES = \
-	$(top_builddir)/util/libutil.la \
+	$(top_builddir)/util/libvt_util.la \
 	$(OTFDEPENDENCIES)
 

ompi/contrib/vt/vt/util/Makefile.am

@@ -1,8 +1,8 @@
-noinst_LTLIBRARIES = libutil.la
+noinst_LTLIBRARIES = libvt_util.la
 
-libutil_la_CFLAGS = -static -prefer-pic
-libutil_la_LDFLAGS = -static
-libutil_la_SOURCES = \
+libvt_util_la_CFLAGS = -static -prefer-pic
+libvt_util_la_LDFLAGS = -static
+libvt_util_la_SOURCES = \
 	hash.h \
 	installdirs.h \
 	util.h \
@@ -10,6 +10,6 @@ libutil_la_SOURCES = \
 	installdirs.c \
 	util.c
 
-nodist_libutil_la_SOURCES = \
+nodist_libvt_util_la_SOURCES = \
 	installdirs_conf.h
 

ompi/contrib/vt/vt/vtlib/Makefile.am

@@ -351,29 +351,29 @@ VT_FMPI_SOURCES = \
 CC = $(MPICC)
 AM_CFLAGS = $(OTFCFLAGS) $(DLCFLAGS) $(LIBWRAPCFLAGS) $(LIBCWRAPCFLAGS) $(IOWRAPCFLAGS) $(MEMHOOKCFLAGS) $(GETCPUCFLAGS) $(RUSAGECFLAGS) $(METRCFLAGS)
 
-libvt_la_LIBADD = $(top_builddir)/util/libutil.la $(OTFLIBRARY) $(METRLIBRARY) $(DLLIBRARY) $(MATHLIBRARY)
-libvt_la_DEPENDENCIES = $(top_builddir)/util/libutil.la $(OTFDEPENDENCIES)
+libvt_la_LIBADD = $(top_builddir)/util/libvt_util.la $(OTFLIBRARY) $(METRLIBRARY) $(DLLIBRARY) $(MATHLIBRARY)
+libvt_la_DEPENDENCIES = $(top_builddir)/util/libvt_util.la $(OTFDEPENDENCIES)
 libvt_la_SOURCES = $(VT_COMMON_SOURCES) $(VT_SEQ_SOURCES)
 
 libvt_mpi_la_CFLAGS = -DVT_MPI $(AM_CFLAGS) $(MPICFLAGS) $(MPIINCDIR) $(ETIMESYNCCFLAGS) $(UNIMCICFLAGS)
-libvt_mpi_la_LIBADD = $(top_builddir)/util/libutil.la $(OTFLIBRARY) $(METRLIBRARY) $(DLLIBRARY) $(MATHLIBRARY)
-libvt_mpi_la_DEPENDENCIES = $(top_builddir)/util/libutil.la $(OTFDEPENDENCIES)
+libvt_mpi_la_LIBADD = $(top_builddir)/util/libvt_util.la $(OTFLIBRARY) $(METRLIBRARY) $(DLLIBRARY) $(MATHLIBRARY)
+libvt_mpi_la_DEPENDENCIES = $(top_builddir)/util/libvt_util.la $(OTFDEPENDENCIES)
 libvt_mpi_la_SOURCES = $(VT_COMMON_SOURCES) $(VT_MPI_SOURCES)
 
 libvt_mt_la_CFLAGS = -DVT_MT $(AM_CFLAGS) $(PTHREADCFLAGS) $(OMPCFLAGS) $(THRDCFLAGS)
-libvt_mt_la_LIBADD = $(top_builddir)/util/libutil.la $(OTFLIBRARY) $(METRLIBRARY) $(DLLIBRARY) $(MATHLIBRARY)
-libvt_mt_la_DEPENDENCIES = $(top_builddir)/util/libutil.la $(OTFDEPENDENCIES)
+libvt_mt_la_LIBADD = $(top_builddir)/util/libvt_util.la $(OTFLIBRARY) $(METRLIBRARY) $(DLLIBRARY) $(MATHLIBRARY)
+libvt_mt_la_DEPENDENCIES = $(top_builddir)/util/libvt_util.la $(OTFDEPENDENCIES)
 libvt_mt_la_SOURCES = $(VT_COMMON_SOURCES) $(VT_MT_SOURCES)
 
 libvt_hyb_la_CFLAGS = -DVT_HYB $(AM_CFLAGS) $(MPICFLAGS) $(MPIINCDIR) $(PTHREADCFLAGS) $(OMPCFLAGS) $(THRDCFLAGS) $(ETIMESYNCCFLAGS) $(UNIMCICFLAGS)
-libvt_hyb_la_LIBADD = $(top_builddir)/util/libutil.la $(OTFLIBRARY) $(METRLIBRARY) $(DLLIBRARY) $(MATHLIBRARY)
-libvt_hyb_la_DEPENDENCIES = $(top_builddir)/util/libutil.la $(OTFDEPENDENCIES)
+libvt_hyb_la_LIBADD = $(top_builddir)/util/libvt_util.la $(OTFLIBRARY) $(METRLIBRARY) $(DLLIBRARY) $(MATHLIBRARY)
+libvt_hyb_la_DEPENDENCIES = $(top_builddir)/util/libvt_util.la $(OTFDEPENDENCIES)
 libvt_hyb_la_SOURCES = $(VT_COMMON_SOURCES) $(VT_HYB_SOURCES)
 
 libvt_java_la_CFLAGS = -DVT_JAVA $(AM_CFLAGS) $(JVMTIINCDIR)
 libvt_java_la_LDFLAGS = -shared
-libvt_java_la_LIBADD = $(top_builddir)/util/libutil.la $(OTFLIBRARY) $(METRLIBRARY)
-libvt_java_la_DEPENDENCIES = $(top_builddir)/util/libutil.la $(OTFDEPENDENCIES)
+libvt_java_la_LIBADD = $(top_builddir)/util/libvt_util.la $(OTFLIBRARY) $(METRLIBRARY)
+libvt_java_la_DEPENDENCIES = $(top_builddir)/util/libvt_util.la $(OTFDEPENDENCIES)
 libvt_java_la_SOURCES = $(VT_COMMON_SOURCES) $(VT_JAVA_SOURCES)
 
 libvt_pomp_la_CFLAGS = -static -prefer-pic $(AM_CFLAGS) $(OPENMP_CFLAGS) -I$(top_srcdir)/tools/opari/lib