Add support for only traversing into the profile/ subdirectory only if

a) we want profiling support, and b) the compiler doesn't support weak
symbols.

This commit was SVN r113.

src/mpi/interface/c/Makefile.am

@@ -5,10 +5,19 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-# JMS: Need more stuff here:
+# If the user selected --disable-profiling, then we don't traverse
-# - Do we want a separate compile for profiling (affects SUBDIRS and LIBADD)
+# into the profile directory.
 
-SUBDIRS			= profile
+if COMPILE_PROFILING_SEPARATELY
+profile_dir		= profile
+profile_lib		= profile/libmpi_c_profile.la
+else
+profile_dir		=
+profile_lib		=
+endif
+
+SUBDIRS			= $(profile_dir)
+DIST_SUBDIRS		= profile
 
 lib_LTLIBRARIES		= libmpi_c.la
 
@@ -16,5 +25,6 @@ libmpi_c_la_SOURCES	= \
 			comm_get_name.c \
 			comm_set_name.c \
 			datatype_get_name.c \
-			datatype_set_name.c
+			datatype_set_name.c \
-libmpi_c_la_LIBADD	= profile/libmpi_c_profile.la
+			profiling.h
+libmpi_c_la_LIBADD	= $(profile_lib)

src/mpi/interface/f77/Makefile.am

@@ -5,10 +5,19 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-# JMS: Need more stuff here:
+# If the user selected --disable-profiling, then we don't traverse
-# - Do we want a separate compile for profiling (affects SUBDIRS and LIBADD)
+# into the profile directory.
 
-SUBDIRS			= profile
+if COMPILE_PROFILING_SEPARATELY
+profile_dir		= profile
+profile_lib		= profile/libmpi_f77_profile.la
+else
+profile_dir		=
+profile_lib		=
+endif
+
+SUBDIRS			= $(profile_dir)
+DIST_SUBDIRS		= profile
 
 lib_LTLIBRARIES		= libmpi_f77.la
 
@@ -16,6 +25,7 @@ libmpi_f77_la_SOURCES	= \
 			comm_get_name_f.c \
 			comm_set_name_f.c \
 			datatype_get_name_f.c \
-			datatype_set_name_f.c
+			datatype_set_name_f.c \
+			profiling.h
 
-libmpi_f77_la_LIBADD	= profile/libmpi_f77_profile.la
+libmpi_f77_la_LIBADD	= $(profile_lib)