[svn-r7366] Purpose:

    Readd

Description:
    Readded the FPHDF5 enabling flags.


Platforms tested:
    AIX (Copper: Fortran & C++)
    Linux (Verbena: Fortran & C++)
    IRIX (Modi4: Parallel & Fortran)
    (Sol is down)

Misc. update:

2 files changed, 37 insertions, 17 deletions

diff --git a/configure b/configure
index 7907e60..628eb73 100755
--- a/configure
+++ b/configure
@@ -1034,6 +1034,7 @@ Optional Features:
   --enable-trace          Enable API tracing capability. Default=no if debug
                           is disabled.
   --enable-parallel       Search for MPI-IO and MPI support files
+  --enable-fphdf5         Enable the Flexible Parallel HDF5 interface
   --enable-filters=all    Turn on all internal I/O filters. One may also
                           specify a comma-separated list of filters or the
                           word no. The default is all internal I/O filters.
@@ -3978,7 +3979,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3981 "configure"' > conftest.$ac_ext
+  echo '#line 3982 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4519,7 +4520,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4523: \"$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
@@ -6326,7 +6327,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6329 "configure"
+#line 6330 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6424,7 +6425,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6427 "configure"
+#line 6428 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -32969,6 +32970,25 @@ _ACEOF
 
   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 "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  else
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  fi
 fi
 
 
diff --git a/configure.in b/configure.in
index 58dfdf8..446acc6 100644
--- a/configure.in
+++ b/configure.in
@@ -2283,19 +2283,19 @@ dnl ----------------------------------------------------------------------
 dnl  ----------------------------------------------------------------------
 dnl  Check if they would like the "Flexible parallel" functions compiled in
 dnl 
-dnl   AC_MSG_CHECKING([if Flexible Parallel HDF5 interface enabled])
-dnl   AC_ARG_ENABLE([fphdf5],
-dnl                 [AC_HELP_STRING([--enable-fphdf5],
-dnl                                 [Enable the Flexible Parallel HDF5
-dnl                                  interface])],
-dnl                 [FPHDF5=$enableval])
-dnl   if test "X$FPHDF5" = "Xyes"; then
-dnl     AC_DEFINE(HAVE_FPHDF5, 1,
-dnl               [Define if we want flexible parallel HDF5 support])
-dnl     AC_MSG_RESULT(yes)
-dnl   else
-dnl     AC_MSG_RESULT(no)
-dnl   fi
+  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])
+    AC_MSG_RESULT(yes)
+  else
+    AC_MSG_RESULT(no)
+  fi
 fi
 
 dnl ----------------------------------------------------------------------