[svn-r13849] Purpose: adding a --with-default-vfd= flag to configuration.

Description:   this flag will define the macro H5_DEFAULT_VFD in src/pubconf.h
               and set it to be either H5FD_SEC2 or H5FD_STDIO, depending on the
               value set with the configuration flag (either sec2 or stdio).

Tested:        kagiso, smirom, linew

3 files changed, 94 insertions, 24 deletions

diff --git a/configure b/configure
index ca9564c..b434543 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 13814 2007-05-29 20:02:34Z koziol .
+# From configure.in Id: configure.in 13846 2007-06-08 13:12:13Z mcgreevy .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.8.0-beta1post1.
 #
@@ -1644,6 +1644,8 @@ Optional Packages:
                           [default=no]
   --with-pthread=DIR      Use the Pthreads library [default=no]
   --with-mpe=DIR          Use MPE instrumentation [default=no]
+  --with-default-vfd=driver
+                          Specify default file driver [default=]
 
 Some influential environment variables:
   CC          C compiler command
@@ -7846,7 +7848,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7849 "configure"' > conftest.$ac_ext
+  echo '#line 7851 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10120,11 +10122,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10123: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10125: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10127: \$? = $ac_status" >&5
+   echo "$as_me:10129: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10388,11 +10390,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10391: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10393: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10395: \$? = $ac_status" >&5
+   echo "$as_me:10397: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10492,11 +10494,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10495: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10497: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10499: \$? = $ac_status" >&5
+   echo "$as_me:10501: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12872,7 +12874,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12875 "configure"
+#line 12877 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12972,7 +12974,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12975 "configure"
+#line 12977 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15324,11 +15326,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15327: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15329: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15331: \$? = $ac_status" >&5
+   echo "$as_me:15333: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15428,11 +15430,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15431: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15433: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15435: \$? = $ac_status" >&5
+   echo "$as_me:15437: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16998,11 +17000,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17001: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17003: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17005: \$? = $ac_status" >&5
+   echo "$as_me:17007: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17102,11 +17104,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17105: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17107: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17109: \$? = $ac_status" >&5
+   echo "$as_me:17111: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19300,11 +19302,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19303: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19305: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19307: \$? = $ac_status" >&5
+   echo "$as_me:19309: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19568,11 +19570,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19571: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19573: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19575: \$? = $ac_status" >&5
+   echo "$as_me:19577: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19672,11 +19674,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19675: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19677: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19679: \$? = $ac_status" >&5
+   echo "$as_me:19681: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -50450,6 +50452,42 @@ _ACEOF
 
 fi
 
+
+{ echo "$as_me:$LINENO: checking for Default Virtual File Driver definition" >&5
+echo $ECHO_N "checking for Default Virtual File Driver definition... $ECHO_C" >&6; }
+
+# Check whether --with-default-vfd was given.
+if test "${with_default_vfd+set}" = set; then
+  withval=$with_default_vfd;
+else
+  withval=
+fi
+
+
+if test "X$withval" = "Xsec2"; then
+    { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+    default_vfd=yes
+    vfd_define=H5FD_SEC2
+elif test "X$withval" = "Xstdio"; then
+    { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+    default_vfd=yes
+    vfd_define=H5FD_STDIO
+else
+    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+    default_vfd=no
+fi
+
+if test "X$default_vfd" = "Xyes"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_VFD $vfd_define
+_ACEOF
+
+fi
+
 { echo "$as_me:$LINENO: checking for Stream Virtual File Driver support" >&5
 echo $ECHO_N "checking for Stream Virtual File Driver support... $ECHO_C" >&6; }
 # Check whether --enable-stream-vfd was given.
diff --git a/configure.in b/configure.in
index 994e739..7ac71fb 100644
--- a/configure.in
+++ b/configure.in
@@ -2658,6 +2658,35 @@ if test 1 = 2; then
             [Define if shared writing must be disabled (CodeWarrior only)])
 fi
 
+dnl --------------------------------------------------------------------------
+dnl Should the Default Virtual File Driver be compiled?
+dnl
+
+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=)
+
+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
+
 dnl -----------------------------------------------------------------------------
 dnl Should the Stream Virtual File Driver be compiled in ?
 dnl
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 3817ea8..a3a8c30 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -11,6 +11,9 @@
    values. */
 #undef CONVERT_DENORMAL_FLOAT
 
+/* Define the default virtual file driver to compile */
+#undef DEFAULT_VFD
+
 /* Define if `dev_t' is a scalar */
 #undef DEV_T_IS_SCALAR