8 files changed, 34 insertions, 12 deletions
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index ce80cfb..97effa3 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -669,11 +669,11 @@ EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # We need to tell automake what to clean
 MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/configure b/configure
index a5cd3d9..d96aabf 100755
--- a/configure
+++ b/configure
@@ -699,6 +699,8 @@ PYTHON_LIB
 PYTHON_INCLUDE_DIR
 PYTHON_BIN
 MYALACRITY_LIBS
+BUILD_INDEXING_CONDITIONAL_FALSE
+BUILD_INDEXING_CONDITIONAL_TRUE
 CLEARFILEBUF
 INSTRUMENT_LIBRARY
 TRACE_API
@@ -29519,6 +29521,14 @@ $as_echo "#define HAVE_INDEXING 1" >>confdefs.h
 $as_echo "no" >&6; }
     ;;
 esac
+ if test "X-$INDEXING" = "X-yes"; then
+  BUILD_INDEXING_CONDITIONAL_TRUE=
+  BUILD_INDEXING_CONDITIONAL_FALSE='#'
+else
+  BUILD_INDEXING_CONDITIONAL_TRUE='#'
+  BUILD_INDEXING_CONDITIONAL_FALSE=
+fi
+
 
 ## ----------------------------------------------------------------------
 ## Check for ALACRITY
@@ -29722,6 +29732,10 @@ fi
     if test -z "$HAVE_ALACRITY" -a -n "$HDF5_CONFIG_ABORT"; then
       as_fn_error $? "couldn't find ALACRITY library" "$LINENO" 5
     fi
+
+
+$as_echo "#define HAVE_ALACRITY 1" >>confdefs.h
+
     ;;
 esac
 
@@ -36313,6 +36327,10 @@ if test -z "${BUILD_SHARED_SZIP_CONDITIONAL_TRUE}" && test -z "${BUILD_SHARED_SZ
   as_fn_error $? "conditional \"BUILD_SHARED_SZIP_CONDITIONAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_INDEXING_CONDITIONAL_TRUE}" && test -z "${BUILD_INDEXING_CONDITIONAL_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_INDEXING_CONDITIONAL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_PYTHON_CONDITIONAL_TRUE}" && test -z "${BUILD_PYTHON_CONDITIONAL_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_PYTHON_CONDITIONAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/examples/Makefile.in b/examples/Makefile.in
index be1e19f..30b0443 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -650,6 +650,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog $(EXTLINK_DIRS) *.h5
 @BUILD_EFF_CONDITIONAL_TRUE@                h5ff_client_M6.2_demo h5ff_client_M7.2-pep_demo \
 @BUILD_EFF_CONDITIONAL_TRUE@                h5ff_client_timings h5ff_client_time_datasets
 
+@BUILD_INDEXING_CONDITIONAL_TRUE@EXAMPLE_PROG_INDEXING = h5ff_client_index
 
 # Example programs.
 # Don't tell automake about them, because if it knew they were programs,
@@ -690,11 +691,11 @@ EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # We need to tell automake what to clean
 MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index d273a22..c4d4ff1 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -681,11 +681,11 @@ EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/fortran
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # We need to tell automake what to clean
 MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index 14155d1..1584503 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -658,11 +658,11 @@ EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # We need to tell automake what to clean
 MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index 2a93f7e..ac42db9 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -674,11 +674,11 @@ INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # We need to tell automake what to clean
 MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
index 5daa767..8b9bcfd 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -665,11 +665,11 @@ EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/fortran
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
-EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # We need to tell automake what to clean
 MOSTLYCLEANFILES = *.raw *.meta *.o
-CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF)
+CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) $(EXAMPLE_PROG_INDEXING)
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 1cc315e..8ef3f59 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -55,6 +55,9 @@
 /* Define if gettimeofday() populates the tz pointer passed in */
 #undef GETTIMEOFDAY_GIVES_TZ
 
+/* Define if ALACRITY indexing is supported. */
+#undef HAVE_ALACRITY
+
 /* Define to 1 if you have the <alacrity.h> header file. */
 #undef HAVE_ALACRITY_H