Changes to VT:

- configure:
		- added option --with[out]-liberty to enable/disable symbol demangling with libiberty; default: disabled, because many systems don't provide a PIC version of libiberty
		- fixed compiler flags for building Fortran MPI wrapper library

This commit was SVN r26839.

ompi/contrib/vt/vt/config/m4/acinclude.liberty.m4

@@ -1,6 +1,8 @@
 AC_DEFUN([ACVT_LIBERTY],
 [
 	liberty_error="no"
+	check_liberty="no"
+	force_liberty="no"
 	have_liberty="no"
 
 	LIBERTYDIR=
@@ -8,6 +10,10 @@ AC_DEFUN([ACVT_LIBERTY],
 	LIBERTYLIBDIR=
 	LIBERTYLIB=
 
+	AC_ARG_WITH(liberty,
+		AC_HELP_STRING([--with-liberty], [use libiberty for symbol demangling, default: no]),
+	[AS_IF([test x"$withval" = "xyes"], [check_liberty="yes"; force_liberty="yes"])])
+
 	AC_ARG_WITH(liberty-dir,
 		AC_HELP_STRING([--with-liberty-dir=LIBERTYDIR], [give the path for LIBERTY, default: /usr]),
 	[LIBERTYDIR="$withval/"])
@@ -28,44 +34,47 @@ AC_DEFUN([ACVT_LIBERTY],
 		AC_HELP_STRING([--with-liberty-lib=LIBERTYLIB], [use given liberty lib, default: -liberty]),
 	[LIBERTYLIB="$withval"])
 
-	AS_IF([test x"$LIBERTYLIB" = x -a x"$liberty_error" = "xno"],
+	AS_IF([test x"$check_liberty" = "xyes"],
 	[
-		sav_LIBS=$LIBS
-		LIBS="$LIBS $LIBERTYLIBDIR -liberty_pic"
-		AC_MSG_CHECKING([whether linking with -liberty_pic works])
-		AC_TRY_LINK([],[],
-		[AC_MSG_RESULT([yes]); LIBERTYLIB=-liberty_pic],[AC_MSG_RESULT([no])])
-		LIBS=$sav_LIBS
-	])
+		AS_IF([test x"$LIBERTYLIB" = x -a x"$liberty_error" = "xno"],
+		[
+			sav_LIBS=$LIBS
+			LIBS="$LIBS $LIBERTYLIBDIR -liberty_pic"
+			AC_MSG_CHECKING([whether linking with -liberty_pic works])
+			AC_TRY_LINK([],[],
+			[AC_MSG_RESULT([yes]); LIBERTYLIB=-liberty_pic],[AC_MSG_RESULT([no])])
+			LIBS=$sav_LIBS
+		])
            
-	AS_IF([test x"$LIBERTYLIB" = x -a x"$liberty_error" = "xno"],
-	[
-		sav_LIBS=$LIBS
-		LIBS="$LIBS $LIBERTYLIBDIR -liberty"
-		AC_MSG_CHECKING([whether linking with -liberty works])
-		AC_TRY_LINK([],[],
-		[AC_MSG_RESULT([yes]); LIBERTYLIB=-liberty],[AC_MSG_RESULT([no])])
-		LIBS=$sav_LIBS
-	])
+		AS_IF([test x"$LIBERTYLIB" = x -a x"$liberty_error" = "xno"],
+		[
+			sav_LIBS=$LIBS
+			LIBS="$LIBS $LIBERTYLIBDIR -liberty"
+			AC_MSG_CHECKING([whether linking with -liberty works])
+			AC_TRY_LINK([],[],
+			[AC_MSG_RESULT([yes]); LIBERTYLIB=-liberty],[AC_MSG_RESULT([no])])
+			LIBS=$sav_LIBS
+		])
 
-	AS_IF([test x"$LIBERTYLIB" = x -a x"$liberty_error" = "xno"],
-	[
-		AC_MSG_NOTICE([error: no libiberty found; check path for LIBERTY package first...])
-		liberty_error="yes"
-	])
+		AS_IF([test x"$LIBERTYLIB" = x -a x"$liberty_error" = "xno"],
+		[
+			AC_MSG_NOTICE([error: no libiberty found; check path for LIBERTY package first...])
+			liberty_error="yes"
+		])
 
-	AS_IF([test x"$LIBERTYLIB" != x -a x"$liberty_error" = "xno"],
-	[have_liberty="yes"])
+		AS_IF([test x"$LIBERTYLIB" != x -a x"$liberty_error" = "xno"],
+		[have_liberty="yes"])
 
-	AS_IF([test x"$liberty_error" = "xno"],
-	[
-		sav_CPPFLAGS=$CPPFLAGS
-		CPPFLAGS="$CPPFLAGS $LIBERTYINCDIR"
-		HAVE_DEMANGLE_H=0
-		AC_CHECK_HEADERS([demangle.h])
-		AS_IF([test x"$ac_cv_header_demangle_h"], [HAVE_DEMANGLE_H=1])
-		AC_SUBST(HAVE_DEMANGLE_H)
-		CPPFLAGS=$sav_CPPFLAGS
+		AS_IF([test x"$liberty_error" = "xno"],
+		[
+			sav_CPPFLAGS=$CPPFLAGS
+			CPPFLAGS="$CPPFLAGS $LIBERTYINCDIR"
+			HAVE_DEMANGLE_H=0
+			AC_CHECK_HEADERS([demangle.h])
+			AS_IF([test x"$ac_cv_header_demangle_h"], [HAVE_DEMANGLE_H=1])
+			AC_SUBST(HAVE_DEMANGLE_H)
+			CPPFLAGS=$sav_CPPFLAGS
+		])
 	])
 
 	AC_SUBST(LIBERTYINCDIR)

ompi/contrib/vt/vt/configure.in

@@ -385,6 +385,9 @@ ACVT_CONF_TITLE([NVIDIA CUDA])
 # Check for symbol demangling support by libiberty
 ACVT_CONF_SUBTITLE([Symbol demangling])
 ACVT_LIBERTY
+AS_IF([test x"$enable_config_titles" = "xyes" -a x"$check_liberty" = "xno"],
+[AC_MSG_NOTICE([disabled by default])])
+AS_IF([test x"$force_liberty" = "xyes" -a x"$liberty_error" = "xyes"], [exit 1])
 AM_CONDITIONAL(AMHAVELIBERTY, test x"$have_liberty" = "xyes")
 
 # Check for CUDA Toolkit

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

@@ -471,7 +471,7 @@ libvt_pomp_la_SOURCES = $(VT_POMP_SOURCES)
 
 F77 = $(MPIFC)
 libvt_fmpi_la_CFLAGS = $(libvt_mpi_la_CFLAGS)
-libvt_fmpi_la_FCFLAGS = $(MPIFCFLAGS) $(FMPIINCDIR)
+libvt_fmpi_la_FFLAGS = $(MPIFCFLAGS) $(FMPIINCDIR)
 libvt_fmpi_la_SOURCES = $(VT_FMPI_SOURCES)
 
 vtsysconf_DATA = \