From bfc039550751118a400351bad921b63d4bbd274f Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Sun, 22 Feb 2015 05:44:41 -0500
Subject: [svn-r26272] Merge of r26071 from features/autotools_rework

Removes the --with-default-vfd option from configure. This was basically
useless and only allowed selecting the stdio VFD. Since this is a demo
VFD and not really a production VFD, we decided to retire this option.

Fixes: HDFFV-9081

Tested on: h5committest

NOTE: platypus cmake fails, but this is not a new error.
---
 config/cmake/H5pubconf.h.in |  3 ---
 configure                   | 42 +-----------------------------------------
 configure.ac                | 29 +----------------------------
 src/H5config.h.in           |  3 ---
 src/H5private.h             |  4 ++++
 5 files changed, 6 insertions(+), 75 deletions(-)

diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 05058d2..310fff2 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 36ded58..5392f18 100755
--- a/configure
+++ b/configure
@@ -921,7 +921,6 @@ enable_using_memchecker
 enable_parallel
 with_mpe
 enable_filters
-with_default_vfd
 enable_direct_vfd
 with_default_plugindir
 enable_dconv_exception
@@ -1659,8 +1658,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"]
@@ -28267,6 +28264,7 @@ $as_echo "#define HAVE_MPE 1" >>confdefs.h
   fi
 fi
 
+
 ## ----------------------------------------------------------------------
 ## Turn on internal I/O filters by setting macros in header files
 ## Internal I/O filters are contained entirely within the library and do
@@ -28340,44 +28338,6 @@ $as_echo "#define HAVE_FILTER_SCALEOFFSET 1" >>confdefs.h
   done
 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 aff469f..812ea9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2464,6 +2464,7 @@ if test -n "$PARALLEL"; then
   fi
 fi
 
+
 ## ----------------------------------------------------------------------
 ## Turn on internal I/O filters by setting macros in header files
 ## Internal I/O filters are contained entirely within the library and do
@@ -2531,34 +2532,6 @@ if test -n "$FILTERS"; then
   done
 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 eb18a5e..0c09fe6 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 32b605b..f70530d 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 */
-- 
cgit v0.12