From 58c565aee7919f58de5f6de7a185c792e9e0a545 Mon Sep 17 00:00:00 2001 From: Mike McGreevy Date: Thu, 7 Jun 2007 16:42:40 -0500 Subject: [svn-r13839] Purpose: creation of a DEFAULT_VFD macro in the test/Makefile. Description: a new configure flag has been created that will now set a macro in the test/Makefile. The flag is with-default-vfd=. When set to a virtual file driver (e.g. "--with-default-vfd=sec2"), the macro DEFAULT_VFD will hold this value. Tested: kagiso, smirom, linew --- Makefile.in | 1 + c++/Makefile.in | 1 + c++/examples/Makefile.in | 1 + c++/src/Makefile.in | 1 + c++/test/Makefile.in | 1 + configure | 77 ++++++++++++++++++++++++++++------------- configure.in | 20 +++++++++++ examples/Makefile.in | 1 + fortran/Makefile.in | 1 + fortran/examples/Makefile.in | 1 + fortran/src/Makefile.in | 1 + fortran/test/Makefile.in | 1 + fortran/testpar/Makefile.in | 1 + hl/Makefile.in | 1 + hl/c++/Makefile.in | 1 + hl/c++/examples/Makefile.in | 1 + hl/c++/src/Makefile.in | 1 + hl/c++/test/Makefile.in | 1 + hl/examples/Makefile.in | 1 + hl/fortran/Makefile.in | 1 + hl/fortran/examples/Makefile.in | 1 + hl/fortran/src/Makefile.in | 1 + hl/fortran/test/Makefile.in | 1 + hl/src/Makefile.in | 1 + hl/test/Makefile.in | 1 + hl/tools/Makefile.in | 1 + hl/tools/gif2h5/Makefile.in | 1 + perform/Makefile.in | 1 + src/Makefile.in | 1 + test/Makefile.am | 2 ++ test/Makefile.in | 2 ++ testpar/Makefile.in | 1 + tools/Makefile.in | 1 + tools/h5copy/Makefile.in | 1 + tools/h5diff/Makefile.in | 1 + tools/h5dump/Makefile.in | 1 + tools/h5import/Makefile.in | 1 + tools/h5jam/Makefile.in | 1 + tools/h5ls/Makefile.in | 1 + tools/h5repack/Makefile.in | 1 + tools/lib/Makefile.in | 1 + tools/misc/Makefile.in | 1 + 42 files changed, 114 insertions(+), 25 deletions(-) diff --git a/Makefile.in b/Makefile.in index d43766f..22f192d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -135,6 +135,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/c++/Makefile.in b/c++/Makefile.in index 9a8cc71..7ce60f2 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -106,6 +106,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index edf1ee6..fefd7e5 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -100,6 +100,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index b7392eb..de55a0f 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -136,6 +136,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 1cfe7e6..dfcf744 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -122,6 +122,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/configure b/configure index ca9564c..0fe0d95 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 13829 2007-06-02 18:19:36Z slu . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 1.8.0-beta1post1. # @@ -928,6 +928,7 @@ USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT USE_FILTER_SCALEOFFSET +DEFAULT_VFD_NAME DIRECT_VFD_CONDITIONAL_TRUE DIRECT_VFD_CONDITIONAL_FALSE H5_VERSION @@ -1644,6 +1645,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=drivername + Define a default virtual file driver [default=] Some influential environment variables: CC C compiler command @@ -7846,7 +7849,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7849 "configure"' > conftest.$ac_ext + echo '#line 7852 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10120,11 +10123,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:10126: $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:10130: \$? = $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 +10391,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:10394: $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:10398: \$? = $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 +10495,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:10498: $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:10502: \$? = $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 +12875,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:15330: $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:15334: \$? = $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 +15431,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:15434: $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:15438: \$? = $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 +17001,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:17004: $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:17008: \$? = $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 +17105,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:17108: $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:17112: \$? = $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 +19303,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:19306: $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:19310: \$? = $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 +19571,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:19574: $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:19578: \$? = $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 +19675,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:19678: $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:19682: \$? = $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 +50453,29 @@ _ACEOF fi + +{ echo "$as_me:$LINENO: checking for Default Virtual File Driver" >&5 +echo $ECHO_N "checking for Default Virtual File Driver... $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 + + + DEFAULT_VFD_NAME=${withval} + +if test -z ${withval}; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +else + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +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. @@ -53432,6 +53458,7 @@ USE_FILTER_SHUFFLE!$USE_FILTER_SHUFFLE$ac_delim USE_FILTER_FLETCHER32!$USE_FILTER_FLETCHER32$ac_delim USE_FILTER_NBIT!$USE_FILTER_NBIT$ac_delim USE_FILTER_SCALEOFFSET!$USE_FILTER_SCALEOFFSET$ac_delim +DEFAULT_VFD_NAME!$DEFAULT_VFD_NAME$ac_delim DIRECT_VFD_CONDITIONAL_TRUE!$DIRECT_VFD_CONDITIONAL_TRUE$ac_delim DIRECT_VFD_CONDITIONAL_FALSE!$DIRECT_VFD_CONDITIONAL_FALSE$ac_delim H5_VERSION!$H5_VERSION$ac_delim @@ -53461,7 +53488,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index 994e739..08ff399 100644 --- a/configure.in +++ b/configure.in @@ -2658,6 +2658,26 @@ if test 1 = 2; then [Define if shared writing must be disabled (CodeWarrior only)]) fi +dnl ---------------------------------------------------------------------- +dnl Check if user has provided a custom Virtual File Driver list +dnl + +AC_MSG_CHECKING([for Default Virtual File Driver]) + +AC_ARG_WITH([default-vfd], + [AC_HELP_STRING([--with-default-vfd=drivername], + [Define a default virtual file driver + [default=]])],, + withval=) + +AC_SUBST(DEFAULT_VFD_NAME) DEFAULT_VFD_NAME=${withval} + +if test -z ${withval}; then + AC_MSG_RESULT([no]) +else + AC_MSG_RESULT([yes]) +fi + dnl ----------------------------------------------------------------------------- dnl Should the Stream Virtual File Driver be compiled in ? dnl diff --git a/examples/Makefile.in b/examples/Makefile.in index ef6acf1..50e3d12 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -100,6 +100,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 5a0fef8..2ca29f1 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -110,6 +110,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index ae32620..0785a40 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -100,6 +100,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index e2428e5..524d629 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -163,6 +163,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 2f6ee47..fa061e7 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -156,6 +156,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 338a1a8..192ed31 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -113,6 +113,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 32c02b3..b0cd5c9 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -110,6 +110,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 81cb283..883c063 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -106,6 +106,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index fe344d9..117ecfe 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -100,6 +100,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 35f1148..19c6bba 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -125,6 +125,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index d619d7b..e6e5914 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -116,6 +116,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 64fda22..bc1b3a1 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -100,6 +100,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index db9c4c6..afcbc03 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -110,6 +110,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 693357f..b368d7e 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -100,6 +100,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index bf9ac00..fb4977f 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -130,6 +130,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 3233ade..4f33b33 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -120,6 +120,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 670932f..c71c19d 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -126,6 +126,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 08276d4..027174a 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -136,6 +136,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index aa08313..0adfbe2 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -107,6 +107,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index f8befa4..dd65ce7 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -128,6 +128,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/perform/Makefile.in b/perform/Makefile.in index 496d2ee..42588d8 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -151,6 +151,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/src/Makefile.in b/src/Makefile.in index c985af0..ef8f87b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -181,6 +181,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/test/Makefile.am b/test/Makefile.am index 2def39a..0aa70cc 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -84,6 +84,8 @@ else VFD_LIST = sec2 stdio core split multi family endif +DEFAULT_VFD = @DEFAULT_VFD_NAME@ + # Additional target for running timing test timings _timings: testmeta @for timing in $(TIMINGS) dummy; do \ diff --git a/test/Makefile.in b/test/Makefile.in index ecdd1df..c9eaf94 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -390,6 +390,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -653,6 +654,7 @@ ttsafe_SOURCES = ttsafe.c ttsafe_dcreate.c ttsafe_error.c ttsafe_cancel.c @DIRECT_VFD_CONDITIONAL_FALSE@VFD_LIST = sec2 stdio core split multi family @DIRECT_VFD_CONDITIONAL_TRUE@VFD_LIST = sec2 stdio core split multi family direct +DEFAULT_VFD = @DEFAULT_VFD_NAME@ # Sources for testhdf5 executable testhdf5_SOURCES = testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 49adf76..14144eb 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -143,6 +143,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 9c97e0c..cae61ec 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -107,6 +107,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 5262cc9..e8a57e0 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -124,6 +124,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 0b68c42..ed52f1b 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -131,6 +131,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 51dcc4e..a6bd56e 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -129,6 +129,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 097075a..394b149 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -124,6 +124,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index a4b7142..a10231b 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -135,6 +135,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 50a2f6d..b2d4815 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -118,6 +118,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index b9028b5..2456e51 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -138,6 +138,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 2d09465..52c91b6 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -123,6 +123,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 17e124e..c0fa70d 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -147,6 +147,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ +DEFAULT_VFD_NAME = @DEFAULT_VFD_NAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ -- cgit v0.12