From 1d337831d047a775b36e59374b5bd094cdeab3df Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Tue, 9 May 2006 09:30:09 +0000
Subject: [PATCH] Fixes for more issues found by Dries Kimpe:

  - We had a bad conditional choice, such that asking for pvfs2 would
    result in pvfs trying to build as well, which was going to fail.
  - We didn't try to link in the libray for PVFS2's adio component.
  - We were clobbering romio_flags, so it was impossible to pass
    flags to romio (like the selection of filesystems)

This commit was SVN r9854.
---
 ompi/mca/io/romio/configure.m4           |  1 -
 ompi/mca/io/romio/romio/adio/Makefile.am |  2 +-
 ompi/mca/io/romio/romio/configure.in     | 15 +++------------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/ompi/mca/io/romio/configure.m4 b/ompi/mca/io/romio/configure.m4
index 0951c53a02..f6922e25cc 100644
--- a/ompi/mca/io/romio/configure.m4
+++ b/ompi/mca/io/romio/configure.m4
@@ -61,7 +61,6 @@ AC_DEFUN([MCA_io_romio_CONFIG],[
                          [io_romio_prefix_arg="--prefix=$prefix"], 
                          [io_romio_prefix_arg=])
 
-                   io_romio_flags=
                    AS_IF([test "$cross_compiling" = "yes"],
                        [AS_IF([test ! -z $build], [io_romio_flags="$io_romio_flags --build=$build"])
                         AS_IF([test ! -z $host], [io_romio_flags="$io_romio_flags --host=$host"])
diff --git a/ompi/mca/io/romio/romio/adio/Makefile.am b/ompi/mca/io/romio/romio/adio/Makefile.am
index 907345b312..c91781689f 100644
--- a/ompi/mca/io/romio/romio/adio/Makefile.am
+++ b/ompi/mca/io/romio/romio/adio/Makefile.am
@@ -139,7 +139,7 @@ libadio_la_SOURCES =
 libadio_la_LIBADD = \
         common/libadio_common.la \
         $(HFS_LIB) $(NFS_LIB) $(NTFS_LIB) $(PFS_LIB) $(PIOFS_LIB) \
-        $(PVFS_LIB) $(SFS_LIB) $(TESTFS_LIB) $(UFS_LIB) $(XFS_LIB)
+        $(PVFS_LIB) $(PVFS2_LIB) $(SFS_LIB) $(TESTFS_LIB) $(UFS_LIB) $(XFS_LIB)
 libadio_la_DEPENDENCIES = \
         $(libadio_la_LIBADD)
 
diff --git a/ompi/mca/io/romio/romio/configure.in b/ompi/mca/io/romio/romio/configure.in
index 8cee28c91f..d8f4666e1b 100644
--- a/ompi/mca/io/romio/romio/configure.in
+++ b/ompi/mca/io/romio/romio/configure.in
@@ -1882,18 +1882,9 @@ CFLAGS="$CFLAGS -DHAVE_ROMIOCONF_H"
 AM_PROG_LIBTOOL
 
 # Open MPI: setup the AM_CONDITIONALs to build the different adio devices
-AM_CONDITIONAL(BUILD_GRIDFTP, [test -n "`echo $FILE_SYSTEM | grep gridftp`"])
-AM_CONDITIONAL(BUILD_HFS, [test -n "`echo $FILE_SYSTEM | grep hfs`"])
-AM_CONDITIONAL(BUILD_NFS, [test -n "`echo $FILE_SYSTEM | grep nfs`"])
-AM_CONDITIONAL(BUILD_PANFS, [test -n "`echo $FILE_SYSTEM | grep panfs`"])
-AM_CONDITIONAL(BUILD_PFS, [test -n "`echo $FILE_SYSTEM | grep pfs`"])
-AM_CONDITIONAL(BUILD_PIOFS, [test -n "`echo $FILE_SYSTEM | grep piofs`"])
-AM_CONDITIONAL(BUILD_PVFS, [test -n "`echo $FILE_SYSTEM | grep pvfs`"])
-AM_CONDITIONAL(BUILD_PVFS2, [test -n "`echo $FILE_SYSTEM | grep pvfs2`"])
-AM_CONDITIONAL(BUILD_SFS, [test -n "`echo $FILE_SYSTEM | grep sfs`"])
-AM_CONDITIONAL(BUILD_TESTFS, [test -n "`echo $FILE_SYSTEM | grep testfs`"])
-AM_CONDITIONAL(BUILD_UFS, [test -n "`echo $FILE_SYSTEM | grep ufs`"])
-AM_CONDITIONAL(BUILD_XFS, [test -n "`echo $FILE_SYSTEM | grep xfs`"])
+ m4_foreach([my_fs], 
+  [gridftp, hfs, nfs, panfs, pfs, piofs, pvfs, pvfs2, sfs, testfs, ufs, xfs],
+  [AM_CONDITIONAL(BUILD_[]AS_TR_CPP(my_fs), [test -n "$file_system_]my_fs["])])
 
 echo "setting CC to $CC"
 echo "setting F77 to $F77"