47 files changed, 1006 insertions, 991 deletions

diff --git a/Makefile.in b/Makefile.in
index a54422f..a441259 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,8 +125,6 @@ BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
 BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
 BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
 BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
-BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
-BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
 BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
 BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
@@ -152,6 +150,8 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIRECT_VFD_CONDITIONAL_FALSE = @DIRECT_VFD_CONDITIONAL_FALSE@
+DIRECT_VFD_CONDITIONAL_TRUE = @DIRECT_VFD_CONDITIONAL_TRUE@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 7b6ad46..097c934 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -95,8 +95,6 @@ BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
 BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
 BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
 BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
-BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
-BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
 BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
 BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
@@ -122,6 +120,8 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIRECT_VFD_CONDITIONAL_FALSE = @DIRECT_VFD_CONDITIONAL_FALSE@
+DIRECT_VFD_CONDITIONAL_TRUE = @DIRECT_VFD_CONDITIONAL_TRUE@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 748d906..9b7e718 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -92,8 +92,6 @@ BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
 BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
 BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
 BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
-BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
-BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
 BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
 BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
@@ -119,6 +117,8 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIRECT_VFD_CONDITIONAL_FALSE = @DIRECT_VFD_CONDITIONAL_FALSE@
+DIRECT_VFD_CONDITIONAL_TRUE = @DIRECT_VFD_CONDITIONAL_TRUE@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index e24246e..f39307a 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -129,8 +129,6 @@ BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
 BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
 BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
 BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
-BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
-BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
 BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
 BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
@@ -156,6 +154,8 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIRECT_VFD_CONDITIONAL_FALSE = @DIRECT_VFD_CONDITIONAL_FALSE@
+DIRECT_VFD_CONDITIONAL_TRUE = @DIRECT_VFD_CONDITIONAL_TRUE@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 29b3634..19623b4 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -118,8 +118,6 @@ BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
 BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
 BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
 BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
-BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
-BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
 BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
 BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
@@ -145,6 +143,8 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIRECT_VFD_CONDITIONAL_FALSE = @DIRECT_VFD_CONDITIONAL_FALSE@
+DIRECT_VFD_CONDITIONAL_TRUE = @DIRECT_VFD_CONDITIONAL_TRUE@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
diff --git a/configure b/configure
index 32f2bad..4a9472f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 12715 2006-10-03 22:41:34Z jlaird .
+# From configure.in Id: configure.in 12739 2006-10-10 20:07:16Z slu .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for HDF5 1.8.0-alpha6.
 #
@@ -467,7 +467,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CFLAGS H5_CPPFLAGS H5_FCFLAGS H5_CXXFLAGS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F F9XSUFFIXFLAG FSEARCH_DIRS FC FCFLAGS ac_ct_FC F9XMODFLAG F9XMODEXT FCLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LT_STATIC_EXEC PERL AR TR PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL FORTRAN_SHARED_CONDITIONAL_TRUE FORTRAN_SHARED_CONDITIONAL_FALSE CXX_SHARED_CONDITIONAL_TRUE CXX_SHARED_CONDITIONAL_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP PTHREAD H5_LONE_COLON DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT USE_FILTER_SCALEOFFSET H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_ALL_CONDITIONAL_TRUE BUILD_ALL_CONDITIONAL_FALSE BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CFLAGS H5_CPPFLAGS H5_FCFLAGS H5_CXXFLAGS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F F9XSUFFIXFLAG FSEARCH_DIRS FC FCFLAGS ac_ct_FC F9XMODFLAG F9XMODEXT FCLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LT_STATIC_EXEC PERL AR TR PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL FORTRAN_SHARED_CONDITIONAL_TRUE FORTRAN_SHARED_CONDITIONAL_FALSE CXX_SHARED_CONDITIONAL_TRUE CXX_SHARED_CONDITIONAL_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP PTHREAD H5_LONE_COLON DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT USE_FILTER_SCALEOFFSET DIRECT_VFD_CONDITIONAL_TRUE DIRECT_VFD_CONDITIONAL_FALSE H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_ALL_CONDITIONAL_TRUE BUILD_ALL_CONDITIONAL_FALSE BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -51053,12 +51053,24 @@ _ACEOF
    else
       echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
+      DIRECT_VFD=no
    fi
 else
       echo "$as_me:$LINENO: result: suppressed" >&5
 echo "${ECHO_T}suppressed" >&6
 fi
 
+
+
+if test "X$DIRECT_VFD" = "Xyes"; then
+  DIRECT_VFD_CONDITIONAL_TRUE=
+  DIRECT_VFD_CONDITIONAL_FALSE='#'
+else
+  DIRECT_VFD_CONDITIONAL_TRUE='#'
+  DIRECT_VFD_CONDITIONAL_FALSE=
+fi
+
+
 echo "$as_me:$LINENO: checking whether exception handling functions is checked during data conversions" >&5
 echo $ECHO_N "checking whether exception handling functions is checked during data conversions... $ECHO_C" >&6
 # Check whether --enable-dconv-exception or --disable-dconv-exception was given.
@@ -52296,16 +52308,6 @@ fi
 
 
 
-if test "X$HAVE_PABLO" = "Xyes"; then
-  BUILD_PABLO_CONDITIONAL_TRUE=
-  BUILD_PABLO_CONDITIONAL_FALSE='#'
-else
-  BUILD_PABLO_CONDITIONAL_TRUE='#'
-  BUILD_PABLO_CONDITIONAL_FALSE=
-fi
-
-
-
 if test -n "$TESTPARALLEL"; then
   BUILD_PARALLEL_CONDITIONAL_TRUE=
   BUILD_PARALLEL_CONDITIONAL_FALSE='#'
@@ -52506,6 +52508,13 @@ echo "$as_me: error: conditional \"CXX_SHARED_CONDITIONAL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${DIRECT_VFD_CONDITIONAL_TRUE}" && test -z "${DIRECT_VFD_CONDITIONAL_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"DIRECT_VFD_CONDITIONAL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"DIRECT_VFD_CONDITIONAL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_ALL_CONDITIONAL_TRUE}" && test -z "${BUILD_ALL_CONDITIONAL_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_ALL_CONDITIONAL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -52520,13 +52529,6 @@ echo "$as_me: error: conditional \"BUILD_CXX_CONDITIONAL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${BUILD_PABLO_CONDITIONAL_TRUE}" && test -z "${BUILD_PABLO_CONDITIONAL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_PABLO_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_PABLO_CONDITIONAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${BUILD_PARALLEL_CONDITIONAL_TRUE}" && test -z "${BUILD_PARALLEL_CONDITIONAL_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_PARALLEL_CONDITIONAL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -53248,6 +53250,8 @@ s,@USE_FILTER_SHUFFLE@,$USE_FILTER_SHUFFLE,;t t
 s,@USE_FILTER_FLETCHER32@,$USE_FILTER_FLETCHER32,;t t
 s,@USE_FILTER_NBIT@,$USE_FILTER_NBIT,;t t
 s,@USE_FILTER_SCALEOFFSET@,$USE_FILTER_SCALEOFFSET,;t t
+s,@DIRECT_VFD_CONDITIONAL_TRUE@,$DIRECT_VFD_CONDITIONAL_TRUE,;t t
+s,@DIRECT_VFD_CONDITIONAL_FALSE@,$DIRECT_VFD_CONDITIONAL_FALSE,;t t
 s,@H5_VERSION@,$H5_VERSION,;t t
 s,@CONFIG_DATE@,$CONFIG_DATE,;t t
 s,@CONFIG_USER@,$CONFIG_USER,;t t
@@ -53263,8 +53267,6 @@ s,@BUILD_ALL_CONDITIONAL_TRUE@,$BUILD_ALL_CONDITIONAL_TRUE,;t t
 s,@BUILD_ALL_CONDITIONAL_FALSE@,$BUILD_ALL_CONDITIONAL_FALSE,;t t
 s,@BUILD_CXX_CONDITIONAL_TRUE@,$BUILD_CXX_CONDITIONAL_TRUE,;t t
 s,@BUILD_CXX_CONDITIONAL_FALSE@,$BUILD_CXX_CONDITIONAL_FALSE,;t t
-s,@BUILD_PABLO_CONDITIONAL_TRUE@,$BUILD_PABLO_CONDITIONAL_TRUE,;t t
-s,@BUILD_PABLO_CONDITIONAL_FALSE@,$BUILD_PABLO_CONDITIONAL_FALSE,;t t
 s,@BUILD_PARALLEL_CONDITIONAL_TRUE@,$BUILD_PARALLEL_CONDITIONAL_TRUE,;t t
 s,@BUILD_PARALLEL_CONDITIONAL_FALSE@,$BUILD_PARALLEL_CONDITIONAL_FALSE,;t t
 s,@BUILD_FORTRAN_CONDITIONAL_TRUE@,$BUILD_FORTRAN_CONDITIONAL_TRUE,;t t
@@ -54212,6 +54214,9 @@ fi
 PRINT_N "                     Stream VFD"
 IF_ENABLED_DISABLED "$STREAM_VFD"
 
+PRINT_N "                     Direct VFD"
+IF_ENABLED_DISABLED "$DIRECT_VFD"
+
 PRINT_N "                   Threadsafety"
 IF_ENABLED_DISABLED "$THREADSAFE"
 
diff --git a/configure.in b/configure.in
index b141e2c..fa13ecd 100644
--- a/configure.in
+++ b/configure.in
@@ -2605,10 +2605,13 @@ if test "$DIRECT_VFD" = "yes"; then
                 [Define if the direct I/O virtual file driver should be compiled])
    else
       AC_MSG_RESULT([no])
+      DIRECT_VFD=no
    fi
 else
       AC_MSG_RESULT([suppressed])
 fi
+
+AM_CONDITIONAL([DIRECT_VFD_CONDITIONAL], [test "X$DIRECT_VFD" = "Xyes"])
  
 dnl ----------------------------------------------------------------------
 dnl Decide whether the presence of user's exception handling functions is
@@ -3476,7 +3479,6 @@ dnl Create automake conditionals to tell automake makefiles which directories
 dnl need to be compiled
 
 AM_CONDITIONAL([BUILD_CXX_CONDITIONAL], [test "X$HDF_CXX" = "Xyes"])
-AM_CONDITIONAL([BUILD_PABLO_CONDITIONAL], [test "X$HAVE_PABLO" = "Xyes"])
 AM_CONDITIONAL([BUILD_PARALLEL_CONDITIONAL], [test -n "$TESTPARALLEL"])
 AM_CONDITIONAL([BUILD_FORTRAN_CONDITIONAL], [test "X$HDF_FORTRAN" = "Xyes"])
 AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"])
@@ -3798,6 +3800,9 @@ fi
 PRINT_N "                     Stream VFD"
 IF_ENABLED_DISABLED "$STREAM_VFD"
 
+PRINT_N "                     Direct VFD"
+IF_ENABLED_DISABLED "$DIRECT_VFD"
+
 PRINT_N "                   Threadsafety"
 IF_ENABLED_DISABLED "$THREADSAFE"
 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index eb70cad..7e9ac2a 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -92,8 +92,6 @@ BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
 BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
 BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
 BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
-BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
-BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
 BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
 BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
@@ -119,6 +117,8 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIRECT_VFD_CONDITIONAL_FALSE = @DIRECT_VFD_CONDITIONAL_FALSE@
+DIRECT_VFD_CONDITIONAL_TRUE = @DIRECT_VFD_CONDITIONAL_TRUE@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index eb81c2f..b64fc1c 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -99,8 +99,6 @@ BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
 BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
 BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
 BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
-BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
-BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
 BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
 BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
@@ -126,6 +124,8 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIRECT_VFD_CONDITIONAL_FALSE = @DIRECT_VFD_CONDITIONAL_FALSE@
+DIRECT_VFD_CONDITIONAL_TRUE = @DIRECT_VFD_CONDITIONAL_TRUE@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index a5e6b22..117fa3e 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -92,8 +92,6 @@ BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
 BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
 BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
 BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
-BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
-BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
 BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
 BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
@@ -119,6 +117,8 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIRECT_VFD_CONDITIONAL_FALSE = @DIRECT_VFD_CONDITIONAL_FALSE@
+DIRECT_VFD_CONDITIONAL_TRUE = @DIRECT_VFD_CONDITIONAL_TRUE@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 6ffe989..5c12f99 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -154,8 +154,6 @@ BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
 BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
 BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
 BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
-BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
-BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
 BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
 BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
@@ -181,6 +179,8 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIRECT_VFD_CONDITIONAL_FALSE = @DIRECT_VFD_CONDITIONAL_FALSE@
+DIRECT_VFD_CONDITIONAL_TRUE = @DIRECT_VFD_CONDITIONAL_TRUE@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in