Misc normalization with develop

Mostly .github and config directories
HDFGroup · Aug 26, 2023 · dd04dc3 · dd04dc3
1 parent d1cd849
commit dd04dc3
Show file tree

Hide file tree

Showing 17 changed files with 164 additions and 84 deletions.
diff --git a/.clang-format b/.clang-format
@@ -65,28 +65,28 @@ ObjCBlockIndentWidth: 4
 ReflowComments:  true
 SortIncludes:    false
 StatementMacros:
+  - CATCH
   - FUNC_ENTER_API
-  - FUNC_LEAVE_API
   - FUNC_ENTER_NOAPI_NOINIT_NOERR
+  - FUNC_LEAVE_API
   - FUNC_LEAVE_NOAPI
+  - H5E_PRINTF
+  - H5E_THROW
   - H5_BEGIN_TAG
-  - HGOTO_DONE_TAG
   - H5_END_TAG
-  - HSYS_DONE_ERROR
-  - HSYS_GOTO_ERROR
+  - H5_GCC_DIAG_OFF
+  - H5_GCC_DIAG_ON
+  - H5_LEAVE
   - HDONE_ERROR
   - HERROR
-  - H5_LEAVE
-  - H5E_PRINTF
-  - H5E_THROW
   - HGOTO_DONE
+  - HGOTO_DONE_TAG
   - HGOTO_ERROR
-  - HMPI_ERROR
   - HMPI_DONE_ERROR
+  - HMPI_ERROR
   - HMPI_GOTO_ERROR
-  - H5_GCC_DIAG_OFF
-  - H5_GCC_DIAG_ON
-  - CATCH
+  - HSYS_DONE_ERROR
+  - HSYS_GOTO_ERROR
 #llvm10: TypenameMacros:
 #llvm10:   - STACK_OF
 #llvm10:   - LIST

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,7 +2,7 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in the repo.
-* @lrknox @derobins @byrnHDF @fortnern @jhendersonHDF @qkoziol @vchoi-hdfgroup @bmribler @glennsong09 @mattjala @brtnfld
+* @lrknox @derobins @byrnHDF @fortnern @jhendersonHDF @qkoziol @vchoi-hdfgroup @bmribler @glennsong09 @mattjala @brtnfld @mkitti
 
 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -13,5 +13,5 @@ jobs:
       - uses: actions/checkout@v3
       - uses: codespell-project/actions-codespell@master
         with:
-          skip: ./.github/workflows/codespell.yml,./bin/trace,./hl/tools/h5watch/h5watch.c,./tools/test/h5jam/tellub.c,./config/sanitizer/LICENSE,./config/sanitizer/sanitizers.cmake,./tools/test/h5repack/testfiles/*.dat,./c++/src/*.html
+          skip: ./.github/workflows/codespell.yml,./bin/trace,./hl/tools/h5watch/h5watch.c,./tools/test/h5jam/tellub.c,./config/sanitizer/LICENSE,./config/sanitizer/sanitizers.cmake,./tools/test/h5repack/testfiles/*.dat,./test/API/driver,./configure,./bin/ltmain.sh,./bin/depcomp,./bin/config.guess,./bin/config.sub,./autom4te.cache,./m4/libtool.m4,./c++/src/*.html
           ignore_words_list: ot,isnt,inout,nd,parms,parm,ba,offsetP,ser,ois,had,fiter,fo,clude,refere,minnum,offsetp,creat,ans:,eiter,lastr,ans,isn't,ifset,sur,trun,dne,tthe,hda,filname,te,htmp,ake,gord,numer,ro,oce,msdos
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -311,30 +311,31 @@ jobs:
       - name: Dump matrix context
         run: echo '${{ toJSON(matrix) }}'
 
-      - name: Install CMake Dependencies (Linux)
-        run: sudo apt-get install ninja-build doxygen graphviz
-        if: matrix.os == 'ubuntu-latest'
-
-      - name: Install Autotools Dependencies (Linux, serial)
+      # Only CMake need ninja-build, but we just install it unilaterally
+      # libssl, etc. are needed for the ros3 VFD
+      - name: Install Linux Dependencies
         run: |
            sudo apt update
-           sudo apt install automake autoconf libtool libtool-bin
-           sudo apt install gcc-12 g++-12 gfortran-12
+           sudo apt-get install ninja-build doxygen graphviz
            sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
+           sudo apt install gcc-12 g++-12 gfortran-12
            echo "CC=gcc-12" >> $GITHUB_ENV
            echo "CXX=g++-12" >> $GITHUB_ENV
            echo "FC=gfortran-12" >> $GITHUB_ENV
+        if: matrix.os == 'ubuntu-latest'
+
+      # CMake gets libaec from fetchcontent
+      - name: Install Autotools Dependencies (Linux)
+        run: |
+           sudo apt install automake autoconf libtool libtool-bin
            sudo apt install libaec0 libaec-dev
-        if: (matrix.generator == 'autogen') && (matrix.parallel != 'enable')
+        if: (matrix.generator == 'autogen')
 
       - name: Install Autotools Dependencies (Linux, parallel)
         run: |
-           sudo apt update
-           sudo apt install automake autoconf libtool libtool-bin
            sudo apt install openmpi-bin openmpi-common mpi-default-dev
            echo "CC=mpicc" >> $GITHUB_ENV
            echo "FC=mpif90" >> $GITHUB_ENV
-           sudo apt install libaec0 libaec-dev
         if: (matrix.generator == 'autogen') && (matrix.parallel == 'enable')
 
       - name: Install Dependencies (Windows)
@@ -365,7 +366,19 @@ jobs:
           sh ./autogen.sh
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --${{ matrix.deprec_sym }}-deprecated-symbols --with-default-api-version=${{ matrix.default_api }} --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd --${{ matrix.ros3_vfd }}-ros3-vfd --with-szlib=${{ matrix.szip }}
+          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure \
+            --enable-build-mode=${{ matrix.build_mode.autotools }} \
+            --${{ matrix.deprec_sym }}-deprecated-symbols \
+            --with-default-api-version=${{ matrix.default_api }} \
+            --enable-shared \
+            --${{ matrix.parallel }}-parallel \
+            --${{ matrix.cpp }}-cxx \
+            --${{ matrix.fortran }}-fortran \
+            --${{ matrix.java }}-java \
+            --${{ matrix.mirror_vfd }}-mirror-vfd \
+            --${{ matrix.direct_vfd }}-direct-vfd \
+            --${{ matrix.ros3_vfd }}-ros3-vfd \
+            --with-szlib=${{ matrix.szip }}
         shell: bash
         if: (matrix.generator == 'autogen') && ! (matrix.thread_safety.enabled)
 
@@ -374,7 +387,16 @@ jobs:
           sh ./autogen.sh
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --enable-shared --enable-threadsafe --disable-hl --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd --${{ matrix.ros3_vfd }}-ros3-vfd --with-szlib=${{ matrix.szip }}
+          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure \
+            --enable-build-mode=${{ matrix.build_mode.autotools }} \
+            --enable-shared \
+            --enable-threadsafe \
+            --disable-hl \
+            --${{ matrix.parallel }}-parallel \
+            --${{ matrix.mirror_vfd }}-mirror-vfd \
+            --${{ matrix.direct_vfd }}-direct-vfd \
+            --${{ matrix.ros3_vfd }}-ros3-vfd \
+            --with-szlib=${{ matrix.szip }}
         shell: bash
         if: (matrix.generator == 'autogen') && (matrix.thread_safety.enabled)
 
@@ -386,7 +408,25 @@ jobs:
         run: |
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=${{ matrix.java }} -DHDF5_BUILD_DOC=${{ matrix.docs }} -DBUILD_SZIP_WITH_FETCHCONTENT=${{ matrix.libaecfc }} -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} -DBUILD_ZLIB_WITH_FETCHCONTENT=${{ matrix.zlibfc }} -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} $GITHUB_WORKSPACE
+          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \
+            ${{ matrix.generator }} \
+            -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} \
+            -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} \
+            -DBUILD_SHARED_LIBS=ON \
+            -DHDF5_ENABLE_ALL_WARNINGS=ON \
+            -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \
+            -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} \
+            -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} \
+            -DHDF5_BUILD_JAVA=${{ matrix.java }} \
+            -DHDF5_BUILD_DOC=${{ matrix.docs }} \
+            -DBUILD_SZIP_WITH_FETCHCONTENT=${{ matrix.libaecfc }} \
+            -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} \
+            -DBUILD_ZLIB_WITH_FETCHCONTENT=${{ matrix.zlibfc }} \
+            -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} \
+            -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} \
+            -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} \
+            -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} \
+            $GITHUB_WORKSPACE
         shell: bash
         if: (matrix.generator != 'autogen') && ! (matrix.thread_safety.enabled)
 
@@ -395,7 +435,27 @@ jobs:
         run: |
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_THREADSAFE:BOOL=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=OFF -DHDF5_BUILD_FORTRAN:BOOL=OFF -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_BUILD_HL_LIB:BOOL=OFF -DHDF5_BUILD_DOC=OFF -DBUILD_SZIP_WITH_FETCHCONTENT=${{ matrix.libaecfc }} -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} -DBUILD_ZLIB_WITH_FETCHCONTENT=${{ matrix.zlibfc }} -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} $GITHUB_WORKSPACE
+          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \
+            ${{ matrix.generator }} \
+            -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} \
+            -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} \
+            -DBUILD_SHARED_LIBS=ON \
+            -DHDF5_ENABLE_ALL_WARNINGS=ON \
+            -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
+            -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \
+            -DHDF5_BUILD_CPP_LIB:BOOL=OFF \
+            -DHDF5_BUILD_FORTRAN:BOOL=OFF \
+            -DHDF5_BUILD_JAVA:BOOL=OFF \
+            -DHDF5_BUILD_HL_LIB:BOOL=OFF \
+            -DHDF5_BUILD_DOC=OFF \
+            -DBUILD_SZIP_WITH_FETCHCONTENT=${{ matrix.libaecfc }} \
+            -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} \
+            -DBUILD_ZLIB_WITH_FETCHCONTENT=${{ matrix.zlibfc }} \
+            -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} \
+            -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} \
+            -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} \
+            -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} \
+            $GITHUB_WORKSPACE
         shell: bash
         if: (matrix.generator != 'autogen') && (matrix.thread_safety.enabled)
 

diff --git a/Makefile.am b/Makefile.am
@@ -89,7 +89,7 @@ endif
 
 SUBDIRS = src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR) bin $(TOOLS_DIR) utils . \
           $(CXX_DIR) $(FORTRAN_DIR) $(JAVA_DIR) $(HDF5_HL_DIR)
-DIST_SUBDIRS = src test testpar tools utils . c++ fortran hl examples java
+DIST_SUBDIRS = src test testpar bin tools utils . c++ fortran hl examples java
 
 # Some files generated during configure that should be cleaned
 DISTCLEANFILES=config/stamp1 config/stamp2

diff --git a/bin/genparser b/bin/genparser
@@ -236,6 +236,7 @@ do
     echo '#pragma GCC diagnostic ignored "-Wsign-conversion"                ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wstrict-overflow"                ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wstrict-prototypes"              ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"           ' >> tmp.out
     echo '#if !defined (__clang__)                                          ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wlarger-than="                   ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wsuggest-attribute=const"        ' >> tmp.out

diff --git a/config/cmake/ZLIB/zlib-config.cmake.in b/config/cmake/ZLIB/zlib-config.cmake.in
@@ -30,7 +30,7 @@ set (${ZLIB_PACKAGE_NAME}_VERSION_MINOR  @ZLIB_VERSION_MINOR@)
 
 #-----------------------------------------------------------------------------
 # Don't include targets if this file is being picked up by another
-# project which has already build ZLIB as a subproject
+# project which has already built ZLIB as a subproject
 #-----------------------------------------------------------------------------
 if (NOT TARGET "@ZLIB_PACKAGE@")
   include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE@@[email protected])

diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
@@ -28,6 +28,7 @@ Linking Options:
                      AM_LDFLAGS: @AM_LDFLAGS@
                 Extra libraries: @LINK_LIBS@
                        Archiver: @CMAKE_AR@
+                       AR_FLAGS: 
                          Ranlib: @CMAKE_RANLIB@
 
 Languages:
@@ -44,48 +45,48 @@ Languages:
                Static C Library: @H5_ENABLE_STATIC_LIB@
 
                         Fortran: @HDF5_BUILD_FORTRAN@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@                  Fortran Flags: @CMAKE_Fortran_FLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               H5 Fortran Flags: @HDF5_CMAKE_Fortran_FLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               AM Fortran Flags: @AM_FCFLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@         Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@         Static Fortran Library: @H5_ENABLE_STATIC_LIB@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@
+               Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@
+                  Fortran Flags: @CMAKE_Fortran_FLAGS@
+               H5 Fortran Flags: @HDF5_CMAKE_Fortran_FLAGS@
+               AM Fortran Flags: @AM_FCFLAGS@
+         Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
+         Static Fortran Library: @H5_ENABLE_STATIC_LIB@
+               Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@
 
                             C++: @HDF5_BUILD_CPP_LIB@
-@BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
-@BUILD_CXX_CONDITIONAL_TRUE@                      C++ Flags: @CMAKE_CXX_FLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@                   H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@                   AM C++ Flags: @AM_CXXFLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@             Shared C++ Library: @H5_ENABLE_SHARED_LIB@
-@BUILD_CXX_CONDITIONAL_TRUE@             Static C++ Library: @H5_ENABLE_STATIC_LIB@
+                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
+                      C++ Flags: @CMAKE_CXX_FLAGS@
+                   H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
+                   AM C++ Flags: @AM_CXXFLAGS@
+             Shared C++ Library: @H5_ENABLE_SHARED_LIB@
+             Static C++ Library: @H5_ENABLE_STATIC_LIB@
 
-                            JAVA: @HDF5_BUILD_JAVA@
-@BUILD_JAVA_CONDITIONAL_TRUE@                 JAVA Compiler: @CMAKE_Java_COMPILER@ @Java_VERSION@
+                           JAVA: @HDF5_BUILD_JAVA@
+                  JAVA Compiler: @CMAKE_Java_COMPILER@ @Java_VERSION@
 
 Features:
 ---------
-                   Parallel HDF5: @HDF5_ENABLE_PARALLEL@
-Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@
-              Large Parallel I/O: @LARGE_PARALLEL_IO@
-              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@
-          I/O filters (external): @EXTERNAL_FILTERS@
-                             MPE: @H5_HAVE_LIBLMPE@
-                      Direct VFD: @H5_HAVE_DIRECT@
-                      Mirror VFD: @H5_HAVE_MIRROR_VFD@
-              (Read-Only) S3 VFD: @H5_HAVE_ROS3_VFD@
-            (Read-Only) HDFS VFD: @H5_HAVE_LIBHDFS@
-  Packages w/ extra debug output: @INTERNAL_DEBUG_OUTPUT@
-                     API Tracing: @HDF5_ENABLE_TRACE@
-            Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
- Memory allocation sanity checks: @HDF5_MEMORY_ALLOC_SANITY_CHECK@
-          Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
-                Use file locking: @HDF5_FILE_LOCKING_SETTING@
-       Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
-    Optimization Instrumentation: @HDF5_Enable_Instrument@
+                     Parallel HDF5: @HDF5_ENABLE_PARALLEL@
+  Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@
+                Large Parallel I/O: @LARGE_PARALLEL_IO@
+                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@
+            I/O filters (external): @EXTERNAL_FILTERS@
+                               MPE: @H5_HAVE_LIBLMPE@
+                        Direct VFD: @H5_HAVE_DIRECT@
+                        Mirror VFD: @H5_HAVE_MIRROR_VFD@
+                (Read-Only) S3 VFD: @H5_HAVE_ROS3_VFD@
+              (Read-Only) HDFS VFD: @H5_HAVE_LIBHDFS@
+    Packages w/ extra debug output: @INTERNAL_DEBUG_OUTPUT@
+                       API Tracing: @HDF5_ENABLE_TRACE@
+              Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
+   Memory allocation sanity checks: @HDF5_MEMORY_ALLOC_SANITY_CHECK@
+            Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
+                  Use file locking: @HDF5_FILE_LOCKING_SETTING@
+         Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
+      Optimization Instrumentation: @HDF5_Enable_Instrument@
diff --git a/config/gnu-warnings/developer-general b/config/gnu-warnings/developer-general
@@ -1,10 +1,17 @@
 # (suggestions from gcc, not code problems)
 -Waggregate-return
 -Wdisabled-optimization
--Winline
 -Wmissing-format-attribute
 -Wmissing-noreturn
 -Wswitch-default
 -Wswitch-enum
 -Wunsafe-loop-optimizations
 -Wunused-macros
+# -Winline warnings aren't included here because, for at least
+# GNU compilers, this flag appears to conflict specifically with
+# the -Og optimization level flag added for Debug and Developer
+# builds and will produce warnings about functions not being
+# considered for inlining. The flag will be added to the list
+# of compiler flags separately if developer warnings are enabled
+# and the build type is not Debug or Developer
+#-Winline
diff --git a/config/intel-warnings/developer-general b/config/intel-warnings/developer-general
@@ -1,4 +1,11 @@
--Winline
 -Wreorder
 -Wport
 -Wstrict-aliasing
+# -Winline warnings aren't included here because, for at least
+# GNU compilers, this flag appears to conflict specifically with
+# the -Og optimization level flag added for Debug and Developer
+# builds and will produce warnings about functions not being
+# considered for inlining. The flag will be added to the list
+# of compiler flags separately if developer warnings are enabled
+# and the build type is not Debug or Developer
+#-Winline