diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-06-16 17:44:42 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-06-16 17:44:42 (GMT) |
| commit | b2dab0602a642d433fdd110f3d816639133e3db0 (patch) | |
| tree | b8aab1f0fab64d03e5e9731a1fa5339c9fcb46d7 | |
| parent | 20ee439d337fe1dd845ae1ed809f18bdfeefeeb6 (diff) | |
| download | hdf5-b2dab0602a642d433fdd110f3d816639133e3db0.zip hdf5-b2dab0602a642d433fdd110f3d816639133e3db0.tar.gz hdf5-b2dab0602a642d433fdd110f3d816639133e3db0.tar.bz2 | |
[svn-r25298] run reconfigure.
42 files changed, 280 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in index 7a4dec9..718aa6f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -357,6 +357,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/c++/Makefile.in b/c++/Makefile.in index 4eaf23f..bf3499b 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -517,6 +517,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 86a5bdf..b85d158 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -465,6 +465,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index eea95cf..7cb5703 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -531,6 +531,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index a898753..19bf63c 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -522,6 +522,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ @@ -698,6 +698,7 @@ PYTHON_VERSION PYTHON_LIB PYTHON_INCLUDE_DIR PYTHON_BIN +MYFASTBIT_LIBS MYALACRITY_LIBS BUILD_INDEXING_CONDITIONAL_FALSE BUILD_INDEXING_CONDITIONAL_TRUE @@ -959,6 +960,7 @@ enable_instrument enable_clear_file_buffers enable_indexing with_alacrity +with_fastbit enable_python enable_eff enable_using_memchecker @@ -1729,6 +1731,7 @@ Optional Packages: --with-pthread=DIR Specify alternative path to Pthreads library when thread-safe capability is built --with-alacrity=DIR Use ALACRITY [default=no] + --with-fastbit=DIR Use FastBit [default=no] --with-mpe=DIR Use MPE instrumentation [default=no] --with-default-vfd=driver Specify default file driver [default=sec2] @@ -29803,6 +29806,215 @@ $as_echo "#define HAVE_ALACRITY 1" >>confdefs.h esac ## ---------------------------------------------------------------------- +## Check for FastBit +## + +# Check whether --with-fastbit was given. +if test "${with_fastbit+set}" = set; then : + withval=$with_fastbit; +else + withval=no +fi + + +case $withval in + yes) + HAVE_ALACRITY="yes" + for ac_header in iapi.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "iapi.h" "ac_cv_header_iapi_h" "$ac_includes_default" +if test "x$ac_cv_header_iapi_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IAPI_H 1 +_ACEOF + +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fastbit_selection_create in -lfastbit" >&5 +$as_echo_n "checking for fastbit_selection_create in -lfastbit... " >&6; } +if ${ac_cv_lib_fastbit_fastbit_selection_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfastbit $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fastbit_selection_create (); +#ifdef FC_DUMMY_MAIN +#ifndef FC_DUMMY_MAIN_EQ_F77 +# ifdef __cplusplus + extern "C" +# endif + int FC_DUMMY_MAIN() { return 1; } +#endif +#endif +int +main () +{ +return fastbit_selection_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_fastbit_fastbit_selection_create=yes +else + ac_cv_lib_fastbit_fastbit_selection_create=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fastbit_fastbit_selection_create" >&5 +$as_echo "$ac_cv_lib_fastbit_fastbit_selection_create" >&6; } +if test "x$ac_cv_lib_fastbit_fastbit_selection_create" = xyes; then : + MYFASTBIT_LIBS="-lfastbit" +else + unset HAVE_FASTBIT +fi + + + if test -z "$HAVE_FASTBIT" -a -n "$HDF5_CONFIG_ABORT"; then + as_fn_error $? "couldn't find FastBit library" "$LINENO" 5 + fi + ;; + no) + HAVE_FASTBIT="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FastBit library" >&5 +$as_echo_n "checking for FastBit library... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5 +$as_echo "suppressed" >&6; } + ;; + *) + HAVE_FASTBIT="yes" + case "$withval" in + *,*) + fastbit_inc="`echo $withval |cut -f1 -d,`" + fastbit_lib="`echo $withval |cut -f2 -d, -s`" + ;; + *) + if test -n "$withval"; then + fastbit_inc="$withval/include" + fastbit_lib="$withval/lib" + fi + ;; + esac + + ## Trying to include -I/usr/include and -L/usr/lib is redundant and + ## can mess some compilers up. + if test "X$fastbit_inc" = "X/usr/include"; then + fastbit_inc="" + fi + if test "X$fastbit_lib" = "X/usr/lib"; then + fastbit_lib="" + fi + + saved_CPPFLAGS="$CPPFLAGS" + saved_AM_CPPFLAGS="$AM_CPPFLAGS" + saved_LDFLAGS="$LDFLAGS" + saved_AM_LDFLAGS="$AM_LDFLAGS" + + if test -n "$fastbit_inc"; then + CPPFLAGS="$CPPFLAGS -I$fastbit_inc" + AM_CPPFLAGS="$AM_CPPFLAGS -I$fastbit_inc" + fi + + for ac_header in iapi.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "iapi.h" "ac_cv_header_iapi_h" "$ac_includes_default" +if test "x$ac_cv_header_iapi_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IAPI_H 1 +_ACEOF + +else + CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS" +fi + +done + + + if test -n "$fastbit_lib"; then + LDFLAGS="$LDFLAGS -L$fastbit_lib" + AM_LDFLAGS="$AM_LDFLAGS -L$fastbit_lib" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fastbit_selection_create in -lfastbit" >&5 +$as_echo_n "checking for fastbit_selection_create in -lfastbit... " >&6; } +if ${ac_cv_lib_fastbit_fastbit_selection_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfastbit $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fastbit_selection_create (); +#ifdef FC_DUMMY_MAIN +#ifndef FC_DUMMY_MAIN_EQ_F77 +# ifdef __cplusplus + extern "C" +# endif + int FC_DUMMY_MAIN() { return 1; } +#endif +#endif +int +main () +{ +return fastbit_selection_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_fastbit_fastbit_selection_create=yes +else + ac_cv_lib_fastbit_fastbit_selection_create=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fastbit_fastbit_selection_create" >&5 +$as_echo "$ac_cv_lib_fastbit_fastbit_selection_create" >&6; } +if test "x$ac_cv_lib_fastbit_fastbit_selection_create" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBFASTBIT 1 +_ACEOF + + LIBS="-lfastbit $LIBS" + +else + LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_FASTBIT +fi + + + if test -z "$HAVE_FASTBIT" -a -n "$HDF5_CONFIG_ABORT"; then + as_fn_error $? "couldn't find FastBit library" "$LINENO" 5 + fi + + +$as_echo "#define HAVE_FASTBIT 1" >>confdefs.h + + ;; +esac + +## ---------------------------------------------------------------------- ## Check for python devel ## { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the python scripting environment" >&5 diff --git a/examples/Makefile.in b/examples/Makefile.in index e22ba78..67ba535 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -465,6 +465,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 080502d..61bdd0b 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -521,6 +521,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index bb93822..625820d 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -473,6 +473,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 69990da..13c2da9 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -582,6 +582,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index c675e60..d78b14c 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -591,6 +591,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index aab3ecc..5fa91dd 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -517,6 +517,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/Makefile.in b/hl/Makefile.in index d940414..9a19e97 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -521,6 +521,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index ac8fe21..97ba752 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -517,6 +517,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 25d1af5..753781e 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -464,6 +464,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 3fb23e4..5f09509 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -523,6 +523,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 409d7b1..76c18f8 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -520,6 +520,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index bf0cd94..78f8773 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -464,6 +464,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 8c0a379..7d4ad7c 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -521,6 +521,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 55dbd45..f875f21 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -464,6 +464,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 776ac77..d0345ab 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -538,6 +538,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 250e68c..70a6107 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -529,6 +529,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 3f8543f..64c609a 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -519,6 +519,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index bb667b5..c415d62 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -556,6 +556,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index e0c4541..86832c5 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -518,6 +518,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 775e031..e7e6e7e 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -532,6 +532,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/perform/Makefile.in b/perform/Makefile.in index 35d3bba..e12c952 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -559,6 +559,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/src/H5config.h.in b/src/H5config.h.in index 19694eb..92276c0 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -123,6 +123,9 @@ /* Define if library information should be embedded in the executables */ #undef HAVE_EMBEDDED_LIBINFO +/* Define if FastBit indexing is supported. */ +#undef HAVE_FASTBIT + /* Define to 1 if you have the <features.h> header file. */ #undef HAVE_FEATURES_H @@ -195,6 +198,9 @@ /* Define to 1 if you have the `get_fpc_csr' function. */ #undef HAVE_GET_FPC_CSR +/* Define to 1 if you have the <iapi.h> header file. */ +#undef HAVE_IAPI_H + /* Define id indexing code should be enabled. */ #undef HAVE_INDEXING @@ -238,6 +244,9 @@ /* Define to 1 if you have the `dmalloc' library (-ldmalloc). */ #undef HAVE_LIBDMALLOC +/* Define to 1 if you have the `fastbit' library (-lfastbit). */ +#undef HAVE_LIBFASTBIT + /* Define to 1 if you have the `iod' library (-liod). */ #undef HAVE_LIBIOD diff --git a/src/Makefile.in b/src/Makefile.in index 21eadd1..ddfbcd5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -195,22 +195,23 @@ am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \ H5Oname.lo H5Onull.lo H5Opline.lo H5Orefcount.lo H5Osdspace.lo \ H5Oshared.lo H5Ostab.lo H5Oshmesg.lo H5Otest.lo H5Ounknown.lo \ H5P.lo H5Pacpl.lo H5Pdapl.lo H5Pdcpl.lo H5Pxapl.lo H5Pxcpl.lo \ - H5Pxxpl.lo H5X.lo H5Xdummy.lo H5Xalacrity.lo H5Pdeprec.lo \ - H5Pdxpl.lo H5Pencdec.lo H5Pfapl.lo H5Pfcpl.lo H5Pfmpl.lo \ - H5Pgcpl.lo H5Pvcpl.lo H5Pmcpl.lo H5Pmapl.lo H5Pint.lo \ - H5Prcapl.lo H5Ptrspl.lo H5Ptrfpl.lo H5Plapl.lo H5Plcpl.lo \ - H5Pocpl.lo H5Pocpypl.lo H5Pstrcpl.lo H5Ptest.lo H5PL.lo H5Q.lo \ - H5R.lo H5Rdeprec.lo H5UC.lo H5RS.lo H5S.lo H5Sall.lo H5Sdbg.lo \ - H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo H5Sselect.lo \ - H5Stest.lo H5SL.lo H5SM.lo H5SMbtree2.lo H5SMcache.lo \ - H5SMmessage.lo H5SMtest.lo H5ST.lo H5T.lo H5Tarray.lo \ - H5Tbit.lo H5Tcommit.lo H5Tcompound.lo H5Tconv.lo H5Tcset.lo \ - H5Tdbg.lo H5Tdeprec.lo H5Tenum.lo H5Tfields.lo H5Tfixed.lo \ - H5Tfloat.lo H5Tinit.lo H5Tnative.lo H5Toffset.lo H5Toh.lo \ - H5Topaque.lo H5Torder.lo H5Tpad.lo H5Tprecis.lo H5Tstrpad.lo \ - H5Tvisit.lo H5Tvlen.lo H5TS.lo H5VM.lo H5WB.lo H5Z.lo \ - H5Zdeflate.lo H5Zfletcher32.lo H5Znbit.lo H5Zshuffle.lo \ - H5Zszip.lo H5Zscaleoffset.lo H5Ztrans.lo + H5Pxxpl.lo H5X.lo H5Xdummy.lo H5Xalacrity.lo H5Xfastbit.lo \ + H5Pdeprec.lo H5Pdxpl.lo H5Pencdec.lo H5Pfapl.lo H5Pfcpl.lo \ + H5Pfmpl.lo H5Pgcpl.lo H5Pvcpl.lo H5Pmcpl.lo H5Pmapl.lo \ + H5Pint.lo H5Prcapl.lo H5Ptrspl.lo H5Ptrfpl.lo H5Plapl.lo \ + H5Plcpl.lo H5Pocpl.lo H5Pocpypl.lo H5Pstrcpl.lo H5Ptest.lo \ + H5PL.lo H5Q.lo H5R.lo H5Rdeprec.lo H5UC.lo H5RS.lo H5S.lo \ + H5Sall.lo H5Sdbg.lo H5Shyper.lo H5Smpio.lo H5Snone.lo \ + H5Spoint.lo H5Sselect.lo H5Stest.lo H5SL.lo H5SM.lo \ + H5SMbtree2.lo H5SMcache.lo H5SMmessage.lo H5SMtest.lo H5ST.lo \ + H5T.lo H5Tarray.lo H5Tbit.lo H5Tcommit.lo H5Tcompound.lo \ + H5Tconv.lo H5Tcset.lo H5Tdbg.lo H5Tdeprec.lo H5Tenum.lo \ + H5Tfields.lo H5Tfixed.lo H5Tfloat.lo H5Tinit.lo H5Tnative.lo \ + H5Toffset.lo H5Toh.lo H5Topaque.lo H5Torder.lo H5Tpad.lo \ + H5Tprecis.lo H5Tstrpad.lo H5Tvisit.lo H5Tvlen.lo H5TS.lo \ + H5VM.lo H5WB.lo H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo \ + H5Znbit.lo H5Zshuffle.lo H5Zszip.lo H5Zscaleoffset.lo \ + H5Ztrans.lo libhdf5_la_OBJECTS = $(am_libhdf5_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -591,6 +592,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ @@ -835,7 +837,7 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ H5Osdspace.c H5Oshared.c H5Ostab.c \ H5Oshmesg.c H5Otest.c H5Ounknown.c \ H5P.c H5Pacpl.c H5Pdapl.c H5Pdcpl.c \ - H5Pxapl.c H5Pxcpl.c H5Pxxpl.c H5X.c H5Xdummy.c H5Xalacrity.c \ + H5Pxapl.c H5Pxcpl.c H5Pxxpl.c H5X.c H5Xdummy.c H5Xalacrity.c H5Xfastbit.c \ H5Pdeprec.c H5Pdxpl.c H5Pencdec.c \ H5Pfapl.c H5Pfcpl.c H5Pfmpl.c \ H5Pgcpl.c H5Pvcpl.c H5Pmcpl.c H5Pmapl.c H5Pint.c H5Prcapl.c H5Ptrspl.c H5Ptrfpl.c \ @@ -1307,6 +1309,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5X.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Xalacrity.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Xdummy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Xfastbit.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Z.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zdeflate.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Zfletcher32.Plo@am__quote@ diff --git a/test/Makefile.in b/test/Makefile.in index 99a2bdd..ed36a3f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -924,6 +924,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 13a408b..f01e996 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -538,6 +538,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 6e7920d..a136811 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -518,6 +518,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 80b7d7e..c4f6201 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -526,6 +526,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index d275466..495f69e 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -533,6 +533,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index a8ece19..91e189e 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -526,6 +526,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 882a7fd..a6ac171 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -526,6 +526,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 9c5fb3d..470186c 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -538,6 +538,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index c532903..e8ccb40 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -518,6 +518,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 7a97227..03fe5b3 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -550,6 +550,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index a6b44d8..27f9ab8 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -528,6 +528,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 59fefbf..83fbca5 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -515,6 +515,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 0eaff60..d10a9c5 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -553,6 +553,7 @@ MPI_GET_SIZE = @MPI_GET_SIZE@ MYALACRITY_LIBS = @MYALACRITY_LIBS@ MYAXE_LIBS = @MYAXE_LIBS@ MYDAOS_LIBS = @MYDAOS_LIBS@ +MYFASTBIT_LIBS = @MYFASTBIT_LIBS@ MYIODP_LIBS = @MYIODP_LIBS@ MYIOD_LIBS = @MYIOD_LIBS@ MYPLFS_LIBS = @MYPLFS_LIBS@ |