From 30e164e2469351eccb7fd0a88f681bc485ab46d0 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Mon, 24 Jan 2011 21:10:14 +0000
Subject: [PATCH] Fix all the problems with "make distcheck" caused by the new
 ROMIO import so that we can finally get a trunk nightly tarball\!

This commit was SVN r24292.
---
 ompi/mca/io/romio/romio/adio/Makefile.am      | 15 ++++++++--
 .../io/romio/romio/adio/ad_zoidfs/Makefile.am | 30 +++++++++----------
 ompi/mca/io/romio/romio/configure.in          |  2 +-
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/ompi/mca/io/romio/romio/adio/Makefile.am b/ompi/mca/io/romio/romio/adio/Makefile.am
index 83ef83e065..048861ca76 100644
--- a/ompi/mca/io/romio/romio/adio/Makefile.am
+++ b/ompi/mca/io/romio/romio/adio/Makefile.am
@@ -152,14 +152,23 @@ XFS_DIR =
 XFS_LIB =
 endif
 
+if BUILD_ZOIDFS
+ZOID_DIR = ad_zoidfs
+ZOID_LIB = ad_zoidfs/libadio_zoidfs.la
+else
+ZOID_DIR =
+ZOID_LIB =
+endif
+
 SUBDIRS = common include \
 	$(BG_DIR) $(BGLOCKLESS_DIR) \
 	$(GRIDFTP_DIR) $(LUSTRE_DIR) $(NFS_DIR) $(NTFS_DIR) $(PANFS_DIR) \
 	$(PFS_DIR) $(PVFS_DIR) $(PVFS2_DIR) $(SFS_DIR) \
-	$(TESTFS_DIR) $(UFS_DIR) $(XFS_DIR)
+	$(TESTFS_DIR) $(UFS_DIR) $(XFS_DIR) $(ZOID_DIR)
 DIST_SUBDIRS = common include \
         ad_bgl ad_bglockless ad_gridftp ad_lustre ad_nfs ad_ntfs \
-        ad_panfs ad_pfs ad_pvfs	ad_pvfs2 ad_sfs ad_testfs ad_ufs ad_xfs
+        ad_panfs ad_pfs ad_pvfs	ad_pvfs2 ad_sfs ad_testfs ad_ufs \
+        ad_xfs ad_zoidfs
 
 # Library
 noinst_LTLIBRARIES = libadio.la
@@ -169,4 +178,4 @@ libadio_la_LIBADD = \
 	$(BG_LIB) $(BGLOCKLESS_LIB) \
         $(GRIDFTP_LIB) $(LUSTRE_LIB) $(NFS_LIB) $(NTFS_LIB) $(PANFS_LIB) \
         $(PFS_LIB) $(PVFS_LIB) $(PVFS2_LIB) $(SFS_LIB) \
-        $(TESTFS_LIB) $(UFS_LIB) $(XFS_LIB)
+        $(TESTFS_LIB) $(UFS_LIB) $(XFS_LIB) $(ZOID_LIB)
diff --git a/ompi/mca/io/romio/romio/adio/ad_zoidfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_zoidfs/Makefile.am
index dfa5b419cd..22e2e83772 100644
--- a/ompi/mca/io/romio/romio/adio/ad_zoidfs/Makefile.am
+++ b/ompi/mca/io/romio/romio/adio/ad_zoidfs/Makefile.am
@@ -18,20 +18,18 @@
 
 include $(top_srcdir)/Makefile.options
 
-EXTRA_DIST = README
-
-noinst_LTLIBRARIES = libadio_zoidf.la
-libadio_zoidf_la_SOURCES = \
-    ad_zoidfs.o \
-    ad_zoidfs_close.o \
-    ad_zoidfs_common.o \
-    ad_zoidfs_delete.o \
-    ad_zoidfs_fcntl.o \
-    ad_zoidfs_flush.o \
-    ad_zoidfs_io.o \
-    ad_zoidfs_open.o \
-    ad_zoidfs_resize.o \
-    ad_zoidfs_features.o\
-    ad_zoidfs_read_list.o \
-    ad_zoidfs_write_list.o
+noinst_LTLIBRARIES = libadio_zoidfs.la
+libadio_zoidfs_la_SOURCES = \
+    ad_zoidfs.c \
+    ad_zoidfs_close.c \
+    ad_zoidfs_common.c \
+    ad_zoidfs_delete.c \
+    ad_zoidfs_fcntl.c \
+    ad_zoidfs_flush.c \
+    ad_zoidfs_io.c \
+    ad_zoidfs_open.c \
+    ad_zoidfs_resize.c \
+    ad_zoidfs_features.c \
+    ad_zoidfs_read_list.c \
+    ad_zoidfs_write_list.c
 
diff --git a/ompi/mca/io/romio/romio/configure.in b/ompi/mca/io/romio/romio/configure.in
index ff22bb7769..0c54b4ab5e 100644
--- a/ompi/mca/io/romio/romio/configure.in
+++ b/ompi/mca/io/romio/romio/configure.in
@@ -2126,7 +2126,7 @@ AM_PROG_LIBTOOL
 
 # Open MPI: setup the AM_CONDITIONALs to build the different adio devices
  m4_foreach([my_fs], 
-  [bgl, bglockless, gridftp, lustre, nfs, panfs, pfs, pvfs, pvfs2, sfs, testfs, ufs, xfs],
+  [bgl, bglockless, gridftp, lustre, nfs, panfs, pfs, pvfs, pvfs2, sfs, testfs, ufs, xfs, zoidfs],
   [AM_CONDITIONAL(BUILD_[]AS_TR_CPP(my_fs), [test -n "$file_system_]my_fs["])])
 
 echo "setting CC to $CC"