*** empty log message ***

configure

@@ -1282,6 +1282,7 @@ Optional Features:
   --enable-osmesa         use OSMesa for offscreen rendering (default=no)
   --enable-cgns           enable CGNS output (default=no)
   --enable-occ            enable OpenCascade support (default=no)
+  --enable-hdf5           enable HDF5 support (default=no)
   --enable-med            enable MED support (default=yes)
   --enable-fm             enable support for FourierModel (default=yes)
   --enable-universal      enable support for universal binaries on Mac
@@ -1934,6 +1935,11 @@ if test "${enable_occ+set}" = set; then
   enableval=$enable_occ;
 fi
 
+# Check whether --enable-hdf5 was given.
+if test "${enable_hdf5+set}" = set; then
+  enableval=$enable_hdf5;
+fi
+
 # Check whether --enable-med was given.
 if test "${enable_med+set}" = set; then
   enableval=$enable_med;
@@ -1973,6 +1979,7 @@ if test "x$enable_minimal" = "xyes"; then
   enable_chaco=no;
   enable_med=no;
   enable_cgns=no;
+  enable_hdf5=no;
   enable_zlib=no;
   if test "x$enable_post" != "xyes"; then
     enable_post=no;
@@ -5650,8 +5657,13 @@ echo "$as_me: WARNING: Could not find FFTW3: disabling FourierModel." >&2;}
   fi
 fi
 
-if test "x${ZLIB}" = "xyes"; then
-  if test "x$enable_med" != "xno"; then
+if test "x${HDF5_PREFIX}" != "x" -a "x$enable_hdf5" != "xno"; then
+  enable_hdf5=yes
+fi
+if test "x${ZLIB}" = "xyes" -a "x$enable_med" != "xno"; then
+  enable_hdf5=yes
+fi
+if test "x$enable_hdf5" = "xyes"; then
   if test "x${HDF5_PREFIX}" != "x"; then
     LDFLAGS="-L${HDF5_PREFIX}/lib ${LDFLAGS}"
   fi
@@ -5716,14 +5728,14 @@ else
   HDF5="no"
 fi
 
+  if test "x${HDF5}" = "xyes"; then
+    LIBS="-lhdf5 ${LIBS}"  # Necessary for CGNS with HDF5
   fi
 fi
 
-if test "x${CGNS_PREFIX}" != "x"; then
-  if test "x$enable_cgns" != "xno"; then
+if test "x${CGNS_PREFIX}" != "x" -a "x$enable_cgns" != "xno"; then
   enable_cgns="yes"
 fi
-fi
 if test "x$enable_cgns" = "xyes"; then
   if test "x${CGNS_PREFIX}" != "x"; then
     LDFLAGS="-L${CGNS_PREFIX}/lib ${LDFLAGS}"
@@ -5734,7 +5746,7 @@ if test "${ac_cv_lib_cgns_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcgns -lhdf5 $LIBS"
+LIBS="-lcgns  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF