[svn-r21916] upper level commit :-\

7 files changed, 74 insertions, 5 deletions

diff --git a/Makefile.in b/Makefile.in
index 19219f6..22c6b73 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,9 +44,9 @@
 # Configure should set AM_MAKEFLAGS to -V to solve this problem in
 # subdirectories.
 # NOTE: This means that invoking pmake in a subdirectory will not work.
-.MAKEFLAGS:@AM_MAKEFLAGS@
-	$(MAKE) all
-
+#xxx.MAKEFLAGS:@AM_MAKEFLAGS@
+#xxx	$(MAKE) all
+#xxx
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 8f9ffb9..0aeb9c8 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -159,6 +159,7 @@ IF (WINDOWS)
   SET (LINK_LIBS ${LINK_LIBS} "kernel32")
 ENDIF (WINDOWS)
 SET (H5_DEFAULT_VFD H5FD_SEC2)
+SET (H5_DEFAULT_VOL H5VL_NATIVE)
 
 IF (WINDOWS)
   SET (H5_HAVE_IO_H 1)
@@ -966,4 +967,4 @@ H5ConversionTests (H5_NO_ALIGNMENT_RESTRICTIONS "Checking IF alignment restricti
 #   problem converting from unsigned long long to long double */
 IF (CYGWIN)
   SET (H5_CYGWIN_ULLONG_TO_LDOUBLE_ROUND_PROBLEM 1)
-ENDIF (CYGWIN)
\ No newline at end of file
+ENDIF (CYGWIN)
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index b2567b5..a5ec410 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -54,6 +54,9 @@
 /* Define the default virtual file driver to compile */
 #cmakedefine H5_DEFAULT_VFD @H5_DEFAULT_VFD@
 
+/* Define the default vol plugin to compile */
+#cmakedefine H5_DEFAULT_VOL @H5_DEFAULT_VOL@
+
 /* 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 1bd687c..74810a6 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 21867 2012-01-08 16:39:01Z hdftest .
+# From configure.in Id: configure.in 21884 2012-01-22 15:49:58Z hdftest .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for HDF5 1.9.107.
 #
@@ -896,6 +896,7 @@ with_mpe
 enable_mpi_size
 enable_filters
 with_default_vfd
+with_default_vol
 enable_direct_vfd
 enable_dconv_exception
 enable_dconv_accuracy
@@ -1641,6 +1642,8 @@ Optional Packages:
   --with-mpe=DIR          Use MPE instrumentation [default=no]
   --with-default-vfd=driver
                           Specify default file driver [default=sec2]
+  --with-default-vol=plugin
+                          Specify default vol plugin [default=native]
   --with-default-api-version=(v16|v18|v110)
                           Specify default release version of public symbols
                           [default=v110]
@@ -28313,6 +28316,37 @@ _ACEOF
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Default VOL definition" >&5
+$as_echo_n "checking for Default VOL definition... " >&6; }
+
+# Check whether --with-default-vol was given.
+if test "${with_default_vol+set}" = set; then :
+  withval=$with_default_vol;
+else
+  withval=native
+fi
+
+
+if test "X$withval" = "Xnative"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    default_vol=yes
+    vol_define=H5VL_NATIVE
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    default_vol=no
+fi
+
+if test "X$default_vol" = "Xyes"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_VOL $vol_define
+_ACEOF
+
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Direct Virtual File Driver support" >&5
 $as_echo_n "checking for Direct Virtual File Driver support... " >&6; }
 
diff --git a/configure.in b/configure.in
index 6d43501..8e2ca2f 100644
--- a/configure.in
+++ b/configure.in
@@ -3012,6 +3012,31 @@ if test "X$default_vfd" = "Xyes"; then
             [Define the default virtual file driver to compile])
 fi
 
+dnl --------------------------------------------------------------------------
+dnl Should the Default Virtual Object Layer plugin be compiled?
+dnl
+
+AC_MSG_CHECKING([for Default VOL definition])
+AC_ARG_WITH([default-vol],
+            [AC_HELP_STRING([--with-default-vol=plugin],
+                            [Specify default vol plugin
+                             [default=native]])],,
+            withval=native)
+
+if test "X$withval" = "Xnative"; then
+    AC_MSG_RESULT([yes])
+    default_vol=yes
+    vol_define=H5VL_NATIVE
+else
+    AC_MSG_RESULT([no])
+    default_vol=no
+fi
+
+if test "X$default_vol" = "Xyes"; then
+  AC_DEFINE_UNQUOTED([DEFAULT_VOL], [$vol_define],
+            [Define the default vol to compile])
+fi
+
 dnl ----------------------------------------------------------------------
 dnl Check if Direct I/O driver is enabled by --enable-direct-vfd
 dnl
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 94b49b5..ffeb5ac 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -35,6 +35,9 @@
 /* Define the default virtual file driver to compile */
 #define H5_DEFAULT_VFD H5FD_SEC2
 
+/* Define the default vol plugin to compile */
+#define H5_DEFAULT_VOL H5VL_NATIVE
+
 /* Define if `dev_t' is a scalar */
 #define H5_DEV_T_IS_SCALAR 1
 
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index b0da7fe..35987c6 100644
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -56,6 +56,9 @@
 /* Define the default virtual file driver to compile */
 #define H5_DEFAULT_VFD H5FD_SEC2
 
+/* Define the default vol plugin to compile */
+#define H5_DEFAULT_VOL H5VL_NATIVE
+
 /* Define if `dev_t' is a scalar */
 #define H5_DEV_T_IS_SCALAR 1