From 63e540366bd355e6f03476f8b060e3098079a8ed Mon Sep 17 00:00:00 2001
From: Rainer Keller <rainer.keller@hlrs.de>
Date: Wed, 28 Oct 2009 23:19:04 +0000
Subject: [PATCH]  - Include the datatype tests again    make distcheck works  
  contrib/dist/make_tarball succeeds too    make checks shows all 5 tests
 passing.

This commit was SVN r22163.
---
 test/Makefile.am          | 2 +-
 test/datatype/Makefile.am | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 2906f36604..dd88364b52 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -24,7 +24,7 @@ if PROJECT_OMPI
 endif
 
 # support needs to be first for dependencies
-SUBDIRS = support asm class threads $(REQUIRES_OMPI)
+SUBDIRS = support asm class threads datatype $(REQUIRES_OMPI)
 DIST_SUBDIRS = event $(SUBDIRS)
 
 TESTS =
diff --git a/test/datatype/Makefile.am b/test/datatype/Makefile.am
index 8ca6124638..d9c19cd0b1 100644
--- a/test/datatype/Makefile.am
+++ b/test/datatype/Makefile.am
@@ -11,11 +11,14 @@
 # $HEADER$
 #
 
-TESTS = checksum position ddt_test ddt_raw opal_datatype_test
+if PROJECT_OMPI
+    MPI_TESTS = checksum position ddt_test ddt_raw
+    MPI_CHECKS = to_self ddt_pack
+endif
+TESTS = opal_datatype_test $(MPI_TESTS)
 
-check_PROGRAMS = $(TESTS) to_self ddt_pack
+check_PROGRAMS = $(TESTS) $(MPI_CHECKS)
 
-# This test currently not built because of #1242.
 ddt_test_SOURCES = ddt_test.c ddt_lib.c ddt_lib.h
 ddt_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
 ddt_test_LDADD = $(top_builddir)/ompi/libmpi.la