VampirTrace:

- added support for shared libraries inside Open MPI
- hidden configure option '--with-openmpi-inside'
- do not show config titles/summary if configuring inside Open MPI

This commit was SVN r22440.

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

@@ -2,13 +2,19 @@ AC_DEFUN([ACVT_CONF_INIT],
 [
 	AC_ARG_ENABLE(config-summary,
 		AC_HELP_STRING([--enable-config-summary],
-			[show summary of configuration, default: enabled]),
+			[show summary of configuration, default: enabled]), [],
-		[enable_config_summary="$enableval"], [enable_config_summary="yes"])
+	[
+		AS_IF([test x"$inside_openmpi" = "xyes"],
+		[enable_config_summary="no"], [enable_config_summary="yes"])
+	])
 
 	AC_ARG_ENABLE(config-titles,
 		AC_HELP_STRING([--enable-config-titles],
-			[show titles for each configure section, default: enabled]),
+			[show titles for each configure section, default: enabled]), [],
-		[enable_config_titles="$enableval"], [enable_config_titles="yes"])
+	[
+		AS_IF([test x"$inside_openmpi" = "xyes"],
+		[enable_config_titles="no"], [enable_config_titles="yes"])
+	])
 ])
 
 AC_DEFUN([ACVT_CONF_OPTIONS],

ompi/contrib/vt/vt/configure.in

@@ -11,6 +11,9 @@ AM_CONFIG_HEADER(config.h)
 # If Automake supports silent rules, enable them.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+# Check whether we are inside Open MPI package
+AC_ARG_WITH(openmpi-inside, [], [inside_openmpi="yes"])
+
 ACVT_CONF_INIT
 
 ACVT_CONF_TITLE([Initialization])
@@ -55,22 +58,6 @@ AS_IF([test "$top_vt_builddir" != "$top_vt_srcdir"],
 	CXXCPPFLAGS='-I$(top_srcdir)'" $CXXCPPFLAGS"
 ])
 
-# Check whether we are inside Open MPI package
-# TODO: This option should be hidden in the help text
-AC_ARG_WITH(openmpi-inside,
-	AC_HELP_STRING([--with-openmpi-inside], [configure inside Open MPI]),
-[
-	inside_openmpi="yes"
-
-	enable_config_titles="no"
-	enable_config_summary="no"
-
-	# TODO: Avoid building of shared libraries, due to currently unsupported
-	#       OMPI's symbol visibility stuff
-	enable_static="yes"
-	enable_shared="no" 
-])
-
 # Check for file system case sensitivity
 ACVT_CSFS
 AM_CONDITIONAL(AMHAVECSFS, test x"$have_csfs" = "xyes")