From d3a0386d36dd7d9fec23edb343ee6e34113be828 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Mon, 11 Jun 2007 13:51:20 -0500
Subject: [svn-r13850] Description: 	Hook "default VFD" configure macros
 into library.

	Also, make "default VFD" default to sec2 instead of nothing.

Tested on:
	FreeBSD/32 6.2 (duty)
	FreeBSD/64 6.2 (liberty)
	Mac OS X/32 10.4.9 (amazon)
---
 configure           | 2 +-
 configure.in        | 4 ++--
 src/H5Pfapl.c       | 4 ++--
 tools/lib/h5tools.c | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index b434543..f453c30 100755
--- a/configure
+++ b/configure
@@ -50460,7 +50460,7 @@ echo $ECHO_N "checking for Default Virtual File Driver definition... $ECHO_C" >&
 if test "${with_default_vfd+set}" = set; then
   withval=$with_default_vfd;
 else
-  withval=
+  withval=sec2
 fi
 
 
diff --git a/configure.in b/configure.in
index 7ac71fb..b7caccd 100644
--- a/configure.in
+++ b/configure.in
@@ -2666,8 +2666,8 @@ AC_MSG_CHECKING([for Default Virtual File Driver definition])
 AC_ARG_WITH([default-vfd],
             [AC_HELP_STRING([--with-default-vfd=driver],
                             [Specify default file driver
-                             [default=]])],,
-            withval=)
+                             [default=sec2]])],,
+            withval=sec2)
 
 if test "X$withval" = "Xsec2"; then
     AC_MSG_RESULT([yes])
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 737f136..dcb249c 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -85,7 +85,7 @@
 #define H5F_ACS_GARBG_COLCT_REF_DEF             0
 /* Definition for file driver ID */
 #define H5F_ACS_FILE_DRV_ID_SIZE                sizeof(hid_t)
-#define H5F_ACS_FILE_DRV_ID_DEF                 H5FD_SEC2
+#define H5F_ACS_FILE_DRV_ID_DEF                 H5_DEFAULT_VFD
 /* Definition for file driver info */
 #define H5F_ACS_FILE_DRV_INFO_SIZE              sizeof(void*)
 #define H5F_ACS_FILE_DRV_INFO_DEF               NULL
@@ -718,7 +718,7 @@ H5P_get_driver(H5P_genplist_t *plist)
     }
 
     if (H5FD_VFD_DEFAULT==ret_value)
-        ret_value = H5FD_SEC2;
+        ret_value = H5_DEFAULT_VFD;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 8f04e76..5334a51 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -178,6 +178,10 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
     /* Determine which driver the user wants to open the file with. Try
      * that driver. If it can't open it, then fail. */
     if(!strcmp(driver, drivernames[SEC2_IDX])) {
+        /* SEC2 driver */
+        if(H5Pset_fapl_sec2(new_fapl) < 0)
+            goto error;
+
         if(drivernum)
             *drivernum = SEC2_IDX;
     } else if(!strcmp(driver, drivernames[FAMILY_IDX])) {
-- 
cgit v0.12