summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-01-29 14:15:48 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-01-29 14:15:48 (GMT)
commitaea0b5b46e8a017de05ce2bcc3983a38444f6b51 (patch)
tree78c433b2be0d0fc942a9ac1b1087029e18c1fbfb
parentfec3d82085dfe7fc5b36ee00389c642d5ec36d72 (diff)
downloadhdf5-aea0b5b46e8a017de05ce2bcc3983a38444f6b51.zip
hdf5-aea0b5b46e8a017de05ce2bcc3983a38444f6b51.tar.gz
hdf5-aea0b5b46e8a017de05ce2bcc3983a38444f6b51.tar.bz2
[svn-r26071] Moved setting H5_DEFAULT_VFD from configure to src/H5private.h.
Fixes HDFFV-9081 Tested on: jam
-rw-r--r--config/cmake/H5pubconf.h.in3
-rwxr-xr-xconfigure41
-rw-r--r--configure.ac28
-rw-r--r--src/H5config.h.in3
-rw-r--r--src/H5private.h4
-rw-r--r--vms/src/h5pubconf.h3
6 files changed, 4 insertions, 78 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 81b8c9a..7551df6 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -57,9 +57,6 @@
/* Define the default plugins path to compile */
#cmakedefine H5_DEFAULT_PLUGINDIR "@H5_DEFAULT_PLUGINDIR@"
-/* Define the default virtual file driver to compile */
-#cmakedefine H5_DEFAULT_VFD @H5_DEFAULT_VFD@
-
/* Define if `dev_t' is a scalar */
#cmakedefine H5_DEV_T_IS_SCALAR @H5_DEV_T_IS_SCALAR@
diff --git a/configure b/configure
index 388b932..fec11c5 100755
--- a/configure
+++ b/configure
@@ -916,7 +916,6 @@ enable_clear_file_buffers
enable_using_memchecker
enable_parallel
with_mpe
-with_default_vfd
enable_direct_vfd
with_default_plugindir
enable_dconv_exception
@@ -1653,8 +1652,6 @@ Optional Packages:
--with-pthread=DIR Specify alternative path to Pthreads library when
thread-safe capability is built
--with-mpe=DIR Use MPE instrumentation [default=no]
- --with-default-vfd=driver
- Specify default file driver [default=sec2]
--with-default-plugindir=location
Specify default location for plugins
[default="/usr/local/hdf5/lib/plugin"]
@@ -28549,44 +28546,6 @@ $as_echo "#define HAVE_MPE 1" >>confdefs.h
fi
fi
-## --------------------------------------------------------------------------
-## Should the Default Virtual File Driver be compiled?
-##
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Default Virtual File Driver definition" >&5
-$as_echo_n "checking for Default Virtual File Driver definition... " >&6; }
-
-# Check whether --with-default-vfd was given.
-if test "${with_default_vfd+set}" = set; then :
- withval=$with_default_vfd;
-else
- withval=sec2
-fi
-
-
-if test "X$withval" = "Xsec2"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- default_vfd=yes
- vfd_define=H5FD_SEC2
-elif test "X$withval" = "Xstdio"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- default_vfd=yes
- vfd_define=H5FD_STDIO
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- default_vfd=no
-fi
-
-if test "X$default_vfd" = "Xyes"; then
-
-cat >>confdefs.h <<_ACEOF
-#define DEFAULT_VFD $vfd_define
-_ACEOF
-
-fi
## ----------------------------------------------------------------------
## Check if Direct I/O driver is enabled by --enable-direct-vfd
diff --git a/configure.ac b/configure.ac
index b45e9d1..10a6bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2527,34 +2527,6 @@ if test -n "$PARALLEL"; then
fi
fi
-## --------------------------------------------------------------------------
-## Should the Default Virtual File Driver be compiled?
-##
-
-AC_MSG_CHECKING([for Default Virtual File Driver definition])
-AC_ARG_WITH([default-vfd],
- [AS_HELP_STRING([--with-default-vfd=driver],
- [Specify default file driver
- [default=sec2]])],,
- withval=sec2)
-
-if test "X$withval" = "Xsec2"; then
- AC_MSG_RESULT([yes])
- default_vfd=yes
- vfd_define=H5FD_SEC2
-elif test "X$withval" = "Xstdio"; then
- AC_MSG_RESULT([yes])
- default_vfd=yes
- vfd_define=H5FD_STDIO
-else
- AC_MSG_RESULT([no])
- default_vfd=no
-fi
-
-if test "X$default_vfd" = "Xyes"; then
- AC_DEFINE_UNQUOTED([DEFAULT_VFD], [$vfd_define],
- [Define the default virtual file driver to compile])
-fi
## ----------------------------------------------------------------------
## Check if Direct I/O driver is enabled by --enable-direct-vfd
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 06e58da..29656b4 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -20,9 +20,6 @@
/* Define the default plugins path to compile */
#undef DEFAULT_PLUGINDIR
-/* Define the default virtual file driver to compile */
-#undef DEFAULT_VFD
-
/* Define if `dev_t' is a scalar */
#undef DEV_T_IS_SCALAR
diff --git a/src/H5private.h b/src/H5private.h
index f971504..e7de94b 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -160,6 +160,10 @@
#include <dirent.h>
#endif
+/* Define the default VFD for this platform.
+ * Since the removal of the Windows VFD, this is sec2 for all platforms.
+ */
+#define H5_DEFAULT_VFD H5FD_SEC2
#ifdef H5_HAVE_WIN32_API
/* The following two defines must be before any windows headers are included */
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 77f2819..21986b3 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -32,9 +32,6 @@
/* Define if C++ compiler recognizes offsetof */
#define H5_CXX_HAVE_OFFSETOF 1
-/* Define the default virtual file driver to compile */
-#define H5_DEFAULT_VFD H5FD_SEC2
-
/* Define if `dev_t' is a scalar */
#define H5_DEV_T_IS_SCALAR 1