[svn-r6027] Purpose:

    Update
Description:
    Added new files to the MANIFEST and added a new configure switch for
    enabling building of the Flexible parallel HDF5 module.
Platforms tested:
    Modi4 Eirene Arabica

3 files changed, 44 insertions, 4 deletions

diff --git a/MANIFEST b/MANIFEST
index 3f42c0c..36ddc68 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -825,6 +825,11 @@
 ./src/H5FDstream.h
 ./src/H5FL.c
 ./src/H5FLprivate.h
+./src/H5FP.c
+./src/H5FPclient.c
+./src/H5FPprivate.h
+./src/H5FPpublic.h
+./src/H5FPserver.c
 ./src/H5G.c
 ./src/H5Gent.c
 ./src/H5Gnode.c
@@ -853,10 +858,12 @@
 ./src/H5Odtype.c
 ./src/H5Oefl.c
 ./src/H5Ofill.c
+./src/H5Ofphdf5.c
 ./src/H5Olayout.c
 ./src/H5Omtime.c
 ./src/H5Oname.c
 ./src/H5Onull.c
+./src/H5Oplist.c
 ./src/H5Oprivate.h
 ./src/H5Opublic.h
 ./src/H5Osdspace.c
diff --git a/configure b/configure
index 0f65239..4e8033e 100755
--- a/configure
+++ b/configure
@@ -1018,6 +1018,7 @@ Optional Features:
   --enable-trace          Enable API tracing capability. Default=no if debug
                           is disabled.
   --enable-parallel=TYPE  Search for MPI-IO and MPI support files
+  --enable-fphdf5         Enable the Flexible Parallel HDF5 interface
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4102,7 +4103,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4105 "configure"' > conftest.$ac_ext
+  echo '#line 4106 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4643,7 +4644,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -6454,7 +6455,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6457 "configure"
+#line 6458 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6552,7 +6553,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6555 "configure"
+#line 6556 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -30135,6 +30136,24 @@ echo "${ECHO_T}yes" >&6
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+  echo "$as_me:$LINENO: checking if Flexible Parallel HDF5 interface enabled" >&5
+echo $ECHO_N "checking if Flexible Parallel HDF5 interface enabled... $ECHO_C" >&6
+  # Check whether --enable-fphdf5 or --disable-fphdf5 was given.
+if test "${enable_fphdf5+set}" = set; then
+  enableval="$enable_fphdf5"
+  FPHDF5=$enableval
+fi;
+  if test "X$FPHDF5" = "Xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FPHDF5 1
+_ACEOF
+
+    echo "yes"
+  else
+    echo "no"
+  fi
 fi
 
 
diff --git a/configure.in b/configure.in
index 9a70dbc..f7dcd20 100644
--- a/configure.in
+++ b/configure.in
@@ -1722,6 +1722,20 @@ int main(int argc, char **argv)
   AC_MSG_RESULT(no),
   AC_MSG_RESULT(yes)
   CPPFLAGS="$CPPFLAGS -DMPI_GET_COUNT_WORKS",AC_MSG_RESULT(no))
+
+  AC_MSG_CHECKING([if Flexible Parallel HDF5 interface enabled])
+  AC_ARG_ENABLE([fphdf5],
+                [AC_HELP_STRING([--enable-fphdf5],
+                                [Enable the Flexible Parallel HDF5
+                                 interface])],
+                [FPHDF5=$enableval])
+  if test "X$FPHDF5" = "Xyes"; then
+    AC_DEFINE(HAVE_FPHDF5, 1,
+              [Define if we want flexible parallel HDF5 support])
+    echo "yes"
+  else
+    echo "no"
+  fi
 fi
 
 dnl ----------------------------------------------------------------------