From 9e93204a23346a5b7cf5b8673cf50e6ac2497021 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Fri, 17 Sep 2021 11:01:50 -0500
Subject: 1.8 Merge HDFFV-11266 - add option to build HL tools #1018 (#1022)

* Merge HDFFV-11266 - add option to build HL tools #1018

* Update configure and Makefile.ins with bin/reconfigure.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
---
 Makefile.in                            |  1 +
 bin/Makefile.in                        |  1 +
 c++/Makefile.in                        |  1 +
 c++/examples/Makefile.in               |  1 +
 c++/src/Makefile.in                    |  1 +
 c++/test/Makefile.in                   |  1 +
 config/cmake/hdf5-config.cmake.in      |  1 +
 config/cmake/libhdf5.settings.cmake.in |  1 +
 configure                              | 36 ++++++++++++++++++++++++++++++++++
 configure.ac                           | 18 +++++++++++++++++
 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/CMakeLists.txt                      | 12 ++++++++++--
 hl/Makefile.am                         |  7 +++++--
 hl/Makefile.in                         |  6 ++++--
 hl/c++/Makefile.am                     |  2 +-
 hl/c++/Makefile.in                     |  3 ++-
 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 +
 release_docs/INSTALL_CMake.txt         |  1 +
 release_docs/RELEASE.txt               |  8 ++++++++
 src/Makefile.in                        |  1 +
 test/Makefile.in                       |  1 +
 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/h5stat/Makefile.in               |  1 +
 tools/lib/Makefile.in                  |  1 +
 tools/libtest/Makefile.in              |  1 +
 tools/misc/Makefile.in                 |  1 +
 tools/perform/Makefile.in              |  1 +
 51 files changed, 127 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cd0b0a1..c1850d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -326,6 +326,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/bin/Makefile.in b/bin/Makefile.in
index d6c0267..8645b13 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -438,6 +438,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/c++/Makefile.in b/c++/Makefile.in
index fdcba18..24c2e19 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -489,6 +489,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 0c54211..535c4ad 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -436,6 +436,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index dd46f7a..0bd465f 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -502,6 +502,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 25f7fb6..71fea3c 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -491,6 +491,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index f7187ec..417a6a5 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -37,6 +37,7 @@ set (${HDF5_PACKAGE_NAME}_ENABLE_F2003    @HDF5_ENABLE_F2003@)
 set (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB   @HDF5_BUILD_CPP_LIB@)
 set (${HDF5_PACKAGE_NAME}_BUILD_TOOLS     @HDF5_BUILD_TOOLS@)
 set (${HDF5_PACKAGE_NAME}_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)
+set (${HDF5_PACKAGE_NAME}_BUILD_HL_TOOLS  @HDF5_BUILD_HL_TOOLS@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_THREADSAFE @HDF5_ENABLE_THREADSAFE@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_PLUGIN_SUPPORT @HDF5_ENABLE_PLUGIN_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 4945463..27448d7 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -66,6 +66,7 @@ Features:
               High Level library: @HDF5_BUILD_HL_LIB@
                 Build HDF5 Tests: @BUILD_TESTING@
                 Build HDF5 Tools: @HDF5_BUILD_TOOLS@
+     Build High-level HDF5 Tools: @HDF5_BUILD_HL_TOOLS@
                     Threadsafety: @HDF5_ENABLE_THREADSAFE@
              Default API mapping: @DEFAULT_API_VERSION@
   With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
diff --git a/configure b/configure
index ae02e63..1da32f3 100755
--- a/configure
+++ b/configure
@@ -642,6 +642,8 @@ HAVE_SHARED_CONDITIONAL_FALSE
 HAVE_SHARED_CONDITIONAL_TRUE
 fortran_linux_linker_option
 SEARCH
+BUILD_TOOLS_HL_CONDITIONAL_FALSE
+BUILD_TOOLS_HL_CONDITIONAL_TRUE
 BUILD_TOOLS_CONDITIONAL_FALSE
 BUILD_TOOLS_CONDITIONAL_TRUE
 BUILD_TESTS_PARALLEL_CONDITIONAL_FALSE
@@ -737,6 +739,7 @@ TIME
 TR
 AR
 PERL
+HL_TOOLS
 HL_FOR
 HL
 CXXCPP
@@ -908,6 +911,7 @@ enable_fortran
 enable_fortran2003
 enable_cxx
 enable_hl
+enable_hltools
 enable_tests
 enable_tools
 enable_shared
@@ -1610,6 +1614,7 @@ Optional Features:
                           specify --enable-fortran [default=no]
   --enable-cxx            Compile the C++ interface [default=no]
   --enable-hl             Enable the high level library [default=yes]
+  --enable-hltools        Enable the high-level tools. [default=yes)]
   --enable-tests          Compile the HDF5 tests [default=yes]
   --enable-tools          Compile the HDF5 tools [default=yes]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -7536,6 +7541,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  HL=""
 ## name of fortran folder inside "hl", if FORTRAN compile is requested
  HL_FOR=""
+## name of tools folder inside "hl", if HL_TOOLS compile is requested
+ HL_TOOLS=""
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if high level library is enabled" >&5
 $as_echo_n "checking if high level library is enabled... " >&6; }
 # Check whether --enable-hl was given.
@@ -7562,6 +7569,23 @@ else
  echo "no"
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the high-level tools are enabled" >&5
+$as_echo_n "checking if the high-level tools are enabled... " >&6; }
+# Check whether --enable-hltools was given.
+if test "${enable_hltools+set}" = set; then :
+  enableval=$enable_hltools; HDF5_HL_TOOLS=$enableval
+fi
+
+
+if test "X${HDF5_HL}" = "Xyes" -a "X-$HDF5_HL_TOOLS" = "X-yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HL_TOOLS="tools"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 
 ## ----------------------------------------------------------------------
 ## Check if they have Perl installed on their system. We only need Perl
@@ -29959,6 +29983,14 @@ else
   BUILD_TOOLS_CONDITIONAL_FALSE=
 fi
 
+ if test "X$HDF5_HL_TOOLS" = "Xyes"; then
+  BUILD_TOOLS_HL_CONDITIONAL_TRUE=
+  BUILD_TOOLS_HL_CONDITIONAL_FALSE='#'
+else
+  BUILD_TOOLS_HL_CONDITIONAL_TRUE='#'
+  BUILD_TOOLS_HL_CONDITIONAL_FALSE=
+fi
+
 
 ## ----------------------------------------------------------------------
 ## Build the Makefiles.
@@ -32075,6 +32107,10 @@ if test -z "${BUILD_TOOLS_CONDITIONAL_TRUE}" && test -z "${BUILD_TOOLS_CONDITION
   as_fn_error $? "conditional \"BUILD_TOOLS_CONDITIONAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_TOOLS_HL_CONDITIONAL_TRUE}" && test -z "${BUILD_TOOLS_HL_CONDITIONAL_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_TOOLS_HL_CONDITIONAL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_SHARED_CONDITIONAL_TRUE}" && test -z "${HAVE_SHARED_CONDITIONAL_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_SHARED_CONDITIONAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index b71e215..8d9b2b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -617,6 +617,8 @@ AC_LANG_POP(C++)
 AC_SUBST(HL) HL=""
 ## name of fortran folder inside "hl", if FORTRAN compile is requested
 AC_SUBST(HL_FOR) HL_FOR=""
+## name of tools folder inside "hl", if HL_TOOLS compile is requested
+AC_SUBST(HL_TOOLS) HL_TOOLS=""
 AC_MSG_CHECKING([if high level library is enabled])
 AC_ARG_ENABLE([hl],
      [AS_HELP_STRING([--enable-hl],
@@ -639,6 +641,21 @@ else
  echo "no"
 fi
 
+AC_MSG_CHECKING([if the high-level tools are enabled])
+AC_ARG_ENABLE([hltools],
+     [AS_HELP_STRING([--enable-hltools],
+                     [Enable the high-level tools.
+                     [default=yes)]
+                     ])],
+     [HDF5_HL_TOOLS=$enableval])
+
+if test "X${HDF5_HL}" = "Xyes" -a "X-$HDF5_HL_TOOLS" = "X-yes"; then
+ AC_MSG_RESULT([yes])
+ HL_TOOLS="tools"
+else
+  AC_MSG_RESULT([no])
+fi
+
 
 ## ----------------------------------------------------------------------
 ## Check if they have Perl installed on their system. We only need Perl
@@ -3480,6 +3497,7 @@ AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"])
 AM_CONDITIONAL([BUILD_TESTS_CONDITIONAL], [test "X$HDF5_TESTS" = "Xyes"])
 AM_CONDITIONAL([BUILD_TESTS_PARALLEL_CONDITIONAL], [test -n "$TESTPARALLEL"])
 AM_CONDITIONAL([BUILD_TOOLS_CONDITIONAL], [test "X$HDF5_TOOLS" = "Xyes"])
+AM_CONDITIONAL([BUILD_TOOLS_HL_CONDITIONAL], [test "X$HDF5_HL_TOOLS" = "Xyes"])
 
 ## ----------------------------------------------------------------------
 ## Build the Makefiles.
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 11be6b2..233429c 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -436,6 +436,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 1b85d94..59cd779 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -493,6 +493,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 23d1462..9b026ed 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -444,6 +444,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index e3c69eb..447bd5f 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -553,6 +553,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index d2b8475..3b3ed11 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -561,6 +561,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index cdf6e06..1422eae 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -489,6 +489,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index 083c60e..5061c6c 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -7,9 +7,17 @@ project (HDF5_HL C)
 
 add_subdirectory (src)
 
-#-- Build the High level Tools
+# Build HDF5 Tools
 if (HDF5_BUILD_TOOLS)
-  add_subdirectory (tools)
+  #-----------------------------------------------------------------------------
+  #-- Option to build the High level Tools
+  #-----------------------------------------------------------------------------
+  if (EXISTS "${HDF5_HL_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_HL_SOURCE_DIR}/tools")
+    option (HDF5_BUILD_HL_TOOLS  "Build HDF5 HL Tools" ON)
+    if (HDF5_BUILD_HL_TOOLS)
+      add_subdirectory (tools)
+    endif ()
+  endif ()
 endif ()
 
 #-- Add High Level Examples
diff --git a/hl/Makefile.am b/hl/Makefile.am
index 4e57228..8c427d3 100644
--- a/hl/Makefile.am
+++ b/hl/Makefile.am
@@ -10,7 +10,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-# 
+#
 # This makefile mostly just reinvokes make in the various subdirectories
 # but does so in the correct order.  You can alternatively invoke make from
 # each subdirectory manually.
@@ -31,17 +31,20 @@ endif
 if BUILD_CXX_CONDITIONAL
   CXX_DIR = c++
 endif
-
 if BUILD_TESTS_CONDITIONAL
   TEST_DIR = test
 else
   TEST_DIR =
 endif
 if BUILD_TOOLS_CONDITIONAL
+if BUILD_TOOLS_HL_CONDITIONAL
   TOOLS_DIR = tools
 else
   TOOLS_DIR =
 endif
+else
+  TOOLS_DIR =
+endif
 
 ## Don't recurse into any subdirectories if HDF5 is not configured to
 ## use the HL library
diff --git a/hl/Makefile.in b/hl/Makefile.in
index 6166533..6cdb0afd 100644
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -26,7 +26,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-# 
+#
 # This makefile mostly just reinvokes make in the various subdirectories
 # but does so in the correct order.  You can alternatively invoke make from
 # each subdirectory manually.
@@ -493,6 +493,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
@@ -685,7 +686,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 @BUILD_TESTS_CONDITIONAL_FALSE@TEST_DIR = 
 @BUILD_TESTS_CONDITIONAL_TRUE@TEST_DIR = test
 @BUILD_TOOLS_CONDITIONAL_FALSE@TOOLS_DIR = 
-@BUILD_TOOLS_CONDITIONAL_TRUE@TOOLS_DIR = tools
+@BUILD_TOOLS_CONDITIONAL_TRUE@@BUILD_TOOLS_HL_CONDITIONAL_FALSE@TOOLS_DIR = 
+@BUILD_TOOLS_CONDITIONAL_TRUE@@BUILD_TOOLS_HL_CONDITIONAL_TRUE@TOOLS_DIR = tools
 @BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src $(TEST_DIR) $(TOOLS_DIR) $(CXX_DIR) $(FORTRAN_DIR)
 DIST_SUBDIRS = src test tools c++ fortran examples
 
diff --git a/hl/c++/Makefile.am b/hl/c++/Makefile.am
index 0c0f97e..a2465b7 100644
--- a/hl/c++/Makefile.am
+++ b/hl/c++/Makefile.am
@@ -14,7 +14,7 @@
 ## Run automake to generate a Makefile.in from this file.
 #
 # High-Level API C++ Makefile(.in)
-# 
+#
 
 include $(top_srcdir)/config/commence.am
 
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index a152115..54343ad 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -27,7 +27,7 @@
 # help@hdfgroup.org.
 #
 # High-Level API C++ Makefile(.in)
-# 
+#
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -489,6 +489,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index e2daf43..b4bd192 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -436,6 +436,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 08cc122..41be875 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -492,6 +492,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 3025729..e1b613c 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -489,6 +489,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index 8341e54..5d62060 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -436,6 +436,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index b0c494e..199e23e 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -493,6 +493,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
index e7ffc85..d8e64c6 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -437,6 +437,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 0c32660..5513947 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -510,6 +510,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 5074d5e..f15e8f0 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -501,6 +501,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 85c2ea4..e70abef 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -491,6 +491,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index cb10c07..ce84a5c 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -527,6 +527,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in
index 9f81530..2754292 100644
--- a/hl/tools/Makefile.in
+++ b/hl/tools/Makefile.in
@@ -490,6 +490,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 9f27702..c1070d6 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -505,6 +505,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index ced3d8e..c93ed51 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -739,6 +739,7 @@ HDF5_BUILD_EXAMPLES "Build HDF5 Library Examples"    ON
 HDF5_BUILD_FORTRAN  "Build FORTRAN support"          OFF
 HDF5_BUILD_HL_LIB   "Build HIGH Level HDF5 Library"  ON
 HDF5_BUILD_TOOLS    "Build HDF5 Tools"               ON
+HDF5_BUILD_HL_TOOLS "Build HIGH Level HDF5 Tools"    ON
 if (HDF5_BUILD_FORTRAN)
     HDF5_ENABLE_F2003 "Enable FORTRAN 2003 Standard" ON
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 234102f..836af99 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -49,6 +49,14 @@ New Features
 
     Configuration:
     -------------
+    - Added new option to control the build of High-Level tools
+      that default ON/enabled.
+
+      Add configure options (autotools - CMake):
+            enable-hltools       HDF5_BUILD_HL_TOOLS
+
+      (ADB - 2021/09/16, HDFFV-11266)
+
     - CMake no longer builds the C++ library by default
 
       HDF5_BUILD_CPP_LIB now defaults to OFF, which is in line with the
diff --git a/src/Makefile.in b/src/Makefile.in
index bcfee9e..2a1f116 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -598,6 +598,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/test/Makefile.in b/test/Makefile.in
index 66439f1..6c2871d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -891,6 +891,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index a8686dc..19d104f 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -522,6 +522,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 83fea9c..21743d2 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -491,6 +491,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in
index 216399e..41bc550 100644
--- a/tools/h5copy/Makefile.in
+++ b/tools/h5copy/Makefile.in
@@ -490,6 +490,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 61fdb12..328d5b2 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -519,6 +519,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 13a3c8f..c424a71 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -522,6 +522,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index a4fecc0..ddc6e61 100644
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -491,6 +491,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index fdcead9..faddc99 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -509,6 +509,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index b558174..dd965d7 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -504,6 +504,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 878f095..b3afc16 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -564,6 +564,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in
index 00f205a..f3b9e7e 100644
--- a/tools/h5stat/Makefile.in
+++ b/tools/h5stat/Makefile.in
@@ -492,6 +492,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 9baf1b8..4127155 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -487,6 +487,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/libtest/Makefile.in b/tools/libtest/Makefile.in
index 1749924..862e27a 100644
--- a/tools/libtest/Makefile.in
+++ b/tools/libtest/Makefile.in
@@ -489,6 +489,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 24e1579..ced465a 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -509,6 +509,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
diff --git a/tools/perform/Makefile.in b/tools/perform/Makefile.in
index 74518b9..64fbc82 100644
--- a/tools/perform/Makefile.in
+++ b/tools/perform/Makefile.in
@@ -528,6 +528,7 @@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 INSTALL = @INSTALL@
-- 
cgit v0.12