diff --git a/config/README.md b/config/README.md
index 8459b7724a..75e725ea4f 100644
--- a/config/README.md
+++ b/config/README.md
@@ -32,8 +32,6 @@ An Autotools build will first use `$host_cpu`, `$host_os`, etc. to try to find a
 suitable platform file in `config` to source and start checking compilers. The
 code that does this is in `configure.ac` (search for `host_os`). For example,
 MacOS will source the `apple` file and FreeBSD will source the `freebsd` file.
-There are a bunch of Linux files, but they all eventually invoke
-`linux-gnulibc1`.
 
 If you dig into one of these files, the way that they check for compilers is
 rather crude. Each OS script will simply source the various C, C++, and
diff --git a/config/cygwin b/config/cygwin
index 9cc6401447..b028e70267 100644
--- a/config/cygwin
+++ b/config/cygwin
@@ -17,5 +17,5 @@
 #
 # See BlankForm in this directory for details.
 
-# Use the linux-gnulibc1 file.
-. $srcdir/config/linux-gnulibc1
+# Use the linux-gnu file
+. $srcdir/config/linux-gnu
diff --git a/config/linux-gnu b/config/linux-gnu
index 0431f94c17..b4139ee1a5 100644
--- a/config/linux-gnu
+++ b/config/linux-gnu
@@ -11,6 +11,391 @@
 # help@hdfgroup.org.
 
 
-# This is the same as linux-gnulibc1
+# This file is part of the HDF5 build script.  It is processed shortly
+# after configure starts and defines, among other things, flags for
+# the various compile modes.
+#
+# See BlankForm in this directory for details.
 
-. $srcdir/config/linux-gnulibc1
+# The default compiler is `gcc'.
+if test -z "$CC"; then
+    if test "X-$enable_parallel" = "X-yes"; then
+	# default to use mpicc which is the defacto MPI compiler name
+	CC=mpicc
+	CC_BASENAME=mpicc
+    else
+	CC=gcc
+	CC_BASENAME=gcc
+    fi
+fi
+
+# Figure out GNU C compiler flags
+. $srcdir/config/gnu-flags
+
+# Figure out PGI C compiler flags
+. $srcdir/config/pgi-flags
+
+# Figure out CCE C compiler flags
+. $srcdir/config/cce-flags
+
+# Figure out Intel oneAPI C compiler flags
+. $srcdir/config/oneapi-flags
+
+# Figure out Intel classic C compiler flags
+. $srcdir/config/intel-flags
+
+# Figure out Clang C compiler flags
+. $srcdir/config/clang-flags
+
+# Figure out NVHPC C compiler flags
+. $srcdir/config/nvidia-flags
+
+# Use default Fortran 90 compiler according to what C compiler is used.
+if test "X-" = "X-$FC"; then
+    case $CC_BASENAME in
+        gcc*)
+            FC=gfortran
+            FC_BASENAME=gfortran
+            ;;
+        pgcc*)
+            FC=pgf90
+            FC_BASENAME=pgf90
+            ;;
+        nvc*)
+            FC=nvfortran
+            FC_BASENAME=nvfortran
+            ;;
+        icx*)
+            FC=ifx
+            FC_BASENAME=ifx
+            ;;
+        icc*)
+            FC=ifort
+            FC_BASENAME=ifort
+            ;;
+        mpicc*)
+            FC=mpif90
+            FC_BASENAME=mpif90
+            ;;
+        clang*)
+            # clang has no fortran compiler. Use gfortran.
+            FC=gfortran
+            FC_BASENAME=gfortran
+            ;;
+    esac
+else
+    case $FC in
+        # The PGI and Intel compilers are automatically detected below
+        ifc*|ifort*|pgf90*|nvfortran*)
+            ;;
+
+        *f95*)
+            # Figure out which compiler we are using: pgf90 or Absoft f95
+            RM='rm -f'
+            tmpfile=/tmp/cmpver.$$
+            $FC -V >$tmpfile
+            if test -s "$tmpfile"; then 
+                if( grep -s 'Absoft' $tmpfile > /dev/null) then
+                    FC_BASENAME=f95
+                fi 
+                if( grep -s 'pgf90' $tmpfile > /dev/null) then
+                    FC_BASENAME=pgf90
+                fi 
+            fi
+            $RM $tmpfile
+            fc_version_info=`$FC -V | grep Absoft`
+            ;;
+         # The NAG compiler
+	 *nagfor*|*nagftn*)
+            RM='rm -f'
+            tmpfile=/tmp/cmpver.$$
+            $FC -V >& $tmpfile
+            if test -s "$tmpfile"; then
+                if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
+                    FC_BASENAME=nagfor
+                fi
+            fi
+            fc_version_info=`grep "NAG Fortran" $tmpfile`
+            echo "compiler '$FC' is $fc_version_info"
+            $RM $tmpfile
+	    ;;
+         *)
+            ;;
+    esac
+fi
+
+# Figure out GNU FC compiler flags
+. $srcdir/config/gnu-fflags
+
+# Figure out PGI FC compiler flags
+. $srcdir/config/pgi-fflags
+
+# Figure out CCE FC compiler flags
+. $srcdir/config/cce-fflags
+
+# Figure out Intel oneAPI FC compiler flags
+. $srcdir/config/oneapi-fflags
+
+# Figure out Intel classic FC compiler flags
+. $srcdir/config/intel-fflags
+
+# Figure out Clang FC compiler flags
+. $srcdir/config/clang-fflags
+
+# Figure out NVHPC FC compiler flags
+. $srcdir/config/nvidia-fflags
+
+case $FC_BASENAME in
+    #
+    # Absoft compiler
+    #
+    f95)
+        # Set required flag for compiling C stubs
+        H5_CFLAGS="$H5_CFLAGS"
+
+        F9XSUFFIXFLAG=""
+        H5_FCFLAGS="$H5_FCFLAGS"
+        FSEARCH_DIRS=""
+
+        # Production
+        PROD_FCFLAGS=
+
+        # Debug
+        DEBUG_FCFLAGS=
+
+        # Symbols
+        SYMBOLS_FCFLAGS="-g"
+        NO_SYMBOLS_FCFLAGS="-s"
+
+        # Profiling
+        PROFILE_FCFLAGS="-pg"
+
+        # Optimization
+        HIGH_OPT_FCFLAGS="-O"
+        DEBUG_OPT_FCFLAGS=
+        NO_OPT_FCFLAGS=
+
+        f9x_flags_set=yes
+        ;;
+#
+#   NAG compiler
+#
+    nagfor)
+
+        F9XSUFFIXFLAG=""
+        AM_FCFLAGS="$AM_FCFLAGS"
+        FSEARCH_DIRS=""
+
+        # Production
+        PROD_FCFLAGS=
+
+        # Debug
+        DEBUG_FCFLAGS="-C"
+
+        # Symbols
+        SYMBOLS_FCFLAGS="-g"
+        NO_SYMBOLS_FCFLAGS="-s"
+
+        # Profiling
+        PROFILE_FCFLAGS="-pg"
+
+        # Optimization
+        HIGH_OPT_FCFLAGS="-O"
+        DEBUG_OPT_FCFLAGS="-O0"
+        NO_OPT_FCFLAGS="-O0"
+
+        f9x_flags_set=yes
+        ;;
+
+esac  
+
+# The default C++ compiler
+
+# The default compiler is `g++'.
+if test -z "$CXX"; then
+  CXX=g++
+  CXX_BASENAME=g++
+fi
+
+# Figure out Intel oneAPI CXX compiler flags
+. $srcdir/config/oneapi-cxxflags
+
+# Figure out Intel classic CXX compiler flags
+# Do this ahead of GNU to avoid icpc being detected as g++
+. $srcdir/config/intel-cxxflags
+
+# Figure out GNU CXX compiler flags
+. $srcdir/config/gnu-cxxflags
+
+# Figure out PGI CXX compiler flags
+. $srcdir/config/pgi-cxxflags
+
+# Figure out Clang CXX compiler flags
+. $srcdir/config/clang-cxxflags
+
+# Figure out NVHPC CXX compiler flags
+. $srcdir/config/nvidia-cxxflags
+
+# compiler version strings
+
+# check if the compiler_version_info is already set
+if test -z "$cc_version_info"; then
+
+case $CC in
+    # whatever matches *pgcc* will also match *gcc*, so this one must come first
+    *pgcc*)
+        cc_version_info=`$CC $CFLAGS $H5_CFLAGS -V 2>&1 | grep 'pgcc'`
+        ;;
+
+    *gcc*)
+        cc_version_info=`$CC $CFLAGS $H5_CFLAGS --version 2>&1 | grep -v 'PathScale' |\
+            grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
+        ;;
+    # this must come before *icc* for the same reason
+    *mpicc*)
+        cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -v 2>&1 | grep 'version' |\
+            sed 's/^[a-z0-9]* for //' |\
+            sed 's/\"/\\\"/g' |\
+            sed 's/^\([a-z]* \)/ built with \1/1'`
+        cc_version_info=`echo $cc_version_info`
+        ;;
+
+    *nvc*)
+        cc_version_info=`$CC $CFLAGS $H5_CFLAGS -V 2>&1 | grep 'nvc'`
+        ;;
+
+    *icx*)
+        cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
+            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
+        ;;
+
+    *icc*)
+        cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
+            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
+        ;;
+
+    *clang*)
+        cc_version_info="`$CC $CFLAGS $H5_CFLAGS --version 2>&1 |\
+            grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`"
+        ;;
+
+    *)
+        echo "No match to get cc_version_info for $CC"
+        ;;
+esac
+
+fi
+
+# get fortran version info
+# check if the compiler_version_info is already set
+if test -z "$fc_version_info"; then
+case $FC in
+    *gfortran*)
+        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\
+            grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
+        ;;
+
+    *mpif90*)
+        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -v 2>&1 | grep 'version' |\
+            sed 's/^[a-z0-9]* for //' |\
+            sed 's/\"/\\\"/g' |\
+            sed 's/^\([a-z]* \)/ built with \1/1'`
+        fc_version_info=`echo $fc_version_info`
+        ;;
+
+    *ifx*)
+        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
+            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
+        ;;
+
+    *ifc*|*ifort*)
+        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
+            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
+        ;;
+
+    *f95*)
+        # Figure out which compiler we are using: pgf90 or Absoft f95
+        RM='rm -f'
+        tmpfile=/tmp/cmpver.$$
+        $FC -V >$tmpfile
+        if test -s "$tmpfile"; then 
+            if( grep -s 'Absoft' $tmpfile > /dev/null) then
+                FC_BASENAME=f95
+            fi 
+        fi
+        $RM $tmpfile
+        fc_version_info=`$FC -V | grep Absoft`
+        ;;
+
+    *g95*)
+        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\
+            grep 'GCC'` 
+        ;;
+
+    *pgf90*)
+        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'pgf90'`
+        ;;
+
+    *nvfortran*)
+        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'nvfortran'`
+        ;;
+
+    *nagfor*|*nagftn*)
+        RM='rm -f'
+        tmpfile=/tmp/cmpver.$$
+        $FC -V >& $tmpfile
+        if test -s "$tmpfile"; then
+           if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
+               FC_BASENAME=nagfor
+           fi
+        fi
+        fc_version_info=`grep "NAG Fortran" $tmpfile`
+        $RM $tmpfile
+        echo "compiler '$FC' is $fc_version_info"
+	;;
+
+     *)
+        echo "No match to get fc_version_info for $FC"
+        ;;
+esac
+fi
+
+# get c++ version info
+# check if the compiler_version_info is already set
+if test -z "$cxx_version_info"; then
+case $CXX in
+    *nvc++*)
+        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'nvc++'`
+        ;;
+    *pgc++*)
+        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'pgc++'`
+        ;;
+    *g++*)
+        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
+            grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
+        ;;
+    *icpx*)
+        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
+            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
+        ;;
+    *icpc*)
+        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
+            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
+        ;;
+    *mpicxx*)
+        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -v 2>&1 | grep 'version' |\
+            sed 's/^[a-z0-9]* for //' |\
+            sed 's/^\([a-z]* \)/ built with \1/1'`
+        cxx_version_info=`echo $cxx_version_info`
+        ;; 
+
+    *clang++*)
+        cxx_version_info="`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
+            grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`"
+        ;;
+
+    *)
+        echo "No match to get cxx_version_info for $CXX"
+        ;;
+esac
+fi
diff --git a/config/linux-gnuaout b/config/linux-gnuaout
deleted file mode 100644
index 0431f94c17..0000000000
--- a/config/linux-gnuaout
+++ /dev/null
@@ -1,16 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://www.hdfgroup.org/licenses.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-
-
-# This is the same as linux-gnulibc1
-
-. $srcdir/config/linux-gnulibc1
diff --git a/config/linux-gnueabihf b/config/linux-gnueabihf
deleted file mode 100644
index 596bf3a703..0000000000
--- a/config/linux-gnueabihf
+++ /dev/null
@@ -1,16 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://www.hdfgroup.org/licenses.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-
-# ARM for Raspberry Pi, etc.
-# This is the same as linux-gnulibc1
-
-. $srcdir/config/linux-gnulibc1
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
deleted file mode 100644
index b4139ee1a5..0000000000
--- a/config/linux-gnulibc1
+++ /dev/null
@@ -1,401 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://www.hdfgroup.org/licenses.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# The default compiler is `gcc'.
-if test -z "$CC"; then
-    if test "X-$enable_parallel" = "X-yes"; then
-	# default to use mpicc which is the defacto MPI compiler name
-	CC=mpicc
-	CC_BASENAME=mpicc
-    else
-	CC=gcc
-	CC_BASENAME=gcc
-    fi
-fi
-
-# Figure out GNU C compiler flags
-. $srcdir/config/gnu-flags
-
-# Figure out PGI C compiler flags
-. $srcdir/config/pgi-flags
-
-# Figure out CCE C compiler flags
-. $srcdir/config/cce-flags
-
-# Figure out Intel oneAPI C compiler flags
-. $srcdir/config/oneapi-flags
-
-# Figure out Intel classic C compiler flags
-. $srcdir/config/intel-flags
-
-# Figure out Clang C compiler flags
-. $srcdir/config/clang-flags
-
-# Figure out NVHPC C compiler flags
-. $srcdir/config/nvidia-flags
-
-# Use default Fortran 90 compiler according to what C compiler is used.
-if test "X-" = "X-$FC"; then
-    case $CC_BASENAME in
-        gcc*)
-            FC=gfortran
-            FC_BASENAME=gfortran
-            ;;
-        pgcc*)
-            FC=pgf90
-            FC_BASENAME=pgf90
-            ;;
-        nvc*)
-            FC=nvfortran
-            FC_BASENAME=nvfortran
-            ;;
-        icx*)
-            FC=ifx
-            FC_BASENAME=ifx
-            ;;
-        icc*)
-            FC=ifort
-            FC_BASENAME=ifort
-            ;;
-        mpicc*)
-            FC=mpif90
-            FC_BASENAME=mpif90
-            ;;
-        clang*)
-            # clang has no fortran compiler. Use gfortran.
-            FC=gfortran
-            FC_BASENAME=gfortran
-            ;;
-    esac
-else
-    case $FC in
-        # The PGI and Intel compilers are automatically detected below
-        ifc*|ifort*|pgf90*|nvfortran*)
-            ;;
-
-        *f95*)
-            # Figure out which compiler we are using: pgf90 or Absoft f95
-            RM='rm -f'
-            tmpfile=/tmp/cmpver.$$
-            $FC -V >$tmpfile
-            if test -s "$tmpfile"; then 
-                if( grep -s 'Absoft' $tmpfile > /dev/null) then
-                    FC_BASENAME=f95
-                fi 
-                if( grep -s 'pgf90' $tmpfile > /dev/null) then
-                    FC_BASENAME=pgf90
-                fi 
-            fi
-            $RM $tmpfile
-            fc_version_info=`$FC -V | grep Absoft`
-            ;;
-         # The NAG compiler
-	 *nagfor*|*nagftn*)
-            RM='rm -f'
-            tmpfile=/tmp/cmpver.$$
-            $FC -V >& $tmpfile
-            if test -s "$tmpfile"; then
-                if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
-                    FC_BASENAME=nagfor
-                fi
-            fi
-            fc_version_info=`grep "NAG Fortran" $tmpfile`
-            echo "compiler '$FC' is $fc_version_info"
-            $RM $tmpfile
-	    ;;
-         *)
-            ;;
-    esac
-fi
-
-# Figure out GNU FC compiler flags
-. $srcdir/config/gnu-fflags
-
-# Figure out PGI FC compiler flags
-. $srcdir/config/pgi-fflags
-
-# Figure out CCE FC compiler flags
-. $srcdir/config/cce-fflags
-
-# Figure out Intel oneAPI FC compiler flags
-. $srcdir/config/oneapi-fflags
-
-# Figure out Intel classic FC compiler flags
-. $srcdir/config/intel-fflags
-
-# Figure out Clang FC compiler flags
-. $srcdir/config/clang-fflags
-
-# Figure out NVHPC FC compiler flags
-. $srcdir/config/nvidia-fflags
-
-case $FC_BASENAME in
-    #
-    # Absoft compiler
-    #
-    f95)
-        # Set required flag for compiling C stubs
-        H5_CFLAGS="$H5_CFLAGS"
-
-        F9XSUFFIXFLAG=""
-        H5_FCFLAGS="$H5_FCFLAGS"
-        FSEARCH_DIRS=""
-
-        # Production
-        PROD_FCFLAGS=
-
-        # Debug
-        DEBUG_FCFLAGS=
-
-        # Symbols
-        SYMBOLS_FCFLAGS="-g"
-        NO_SYMBOLS_FCFLAGS="-s"
-
-        # Profiling
-        PROFILE_FCFLAGS="-pg"
-
-        # Optimization
-        HIGH_OPT_FCFLAGS="-O"
-        DEBUG_OPT_FCFLAGS=
-        NO_OPT_FCFLAGS=
-
-        f9x_flags_set=yes
-        ;;
-#
-#   NAG compiler
-#
-    nagfor)
-
-        F9XSUFFIXFLAG=""
-        AM_FCFLAGS="$AM_FCFLAGS"
-        FSEARCH_DIRS=""
-
-        # Production
-        PROD_FCFLAGS=
-
-        # Debug
-        DEBUG_FCFLAGS="-C"
-
-        # Symbols
-        SYMBOLS_FCFLAGS="-g"
-        NO_SYMBOLS_FCFLAGS="-s"
-
-        # Profiling
-        PROFILE_FCFLAGS="-pg"
-
-        # Optimization
-        HIGH_OPT_FCFLAGS="-O"
-        DEBUG_OPT_FCFLAGS="-O0"
-        NO_OPT_FCFLAGS="-O0"
-
-        f9x_flags_set=yes
-        ;;
-
-esac  
-
-# The default C++ compiler
-
-# The default compiler is `g++'.
-if test -z "$CXX"; then
-  CXX=g++
-  CXX_BASENAME=g++
-fi
-
-# Figure out Intel oneAPI CXX compiler flags
-. $srcdir/config/oneapi-cxxflags
-
-# Figure out Intel classic CXX compiler flags
-# Do this ahead of GNU to avoid icpc being detected as g++
-. $srcdir/config/intel-cxxflags
-
-# Figure out GNU CXX compiler flags
-. $srcdir/config/gnu-cxxflags
-
-# Figure out PGI CXX compiler flags
-. $srcdir/config/pgi-cxxflags
-
-# Figure out Clang CXX compiler flags
-. $srcdir/config/clang-cxxflags
-
-# Figure out NVHPC CXX compiler flags
-. $srcdir/config/nvidia-cxxflags
-
-# compiler version strings
-
-# check if the compiler_version_info is already set
-if test -z "$cc_version_info"; then
-
-case $CC in
-    # whatever matches *pgcc* will also match *gcc*, so this one must come first
-    *pgcc*)
-        cc_version_info=`$CC $CFLAGS $H5_CFLAGS -V 2>&1 | grep 'pgcc'`
-        ;;
-
-    *gcc*)
-        cc_version_info=`$CC $CFLAGS $H5_CFLAGS --version 2>&1 | grep -v 'PathScale' |\
-            grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
-        ;;
-    # this must come before *icc* for the same reason
-    *mpicc*)
-        cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -v 2>&1 | grep 'version' |\
-            sed 's/^[a-z0-9]* for //' |\
-            sed 's/\"/\\\"/g' |\
-            sed 's/^\([a-z]* \)/ built with \1/1'`
-        cc_version_info=`echo $cc_version_info`
-        ;;
-
-    *nvc*)
-        cc_version_info=`$CC $CFLAGS $H5_CFLAGS -V 2>&1 | grep 'nvc'`
-        ;;
-
-    *icx*)
-        cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
-            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
-        ;;
-
-    *icc*)
-        cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
-            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
-        ;;
-
-    *clang*)
-        cc_version_info="`$CC $CFLAGS $H5_CFLAGS --version 2>&1 |\
-            grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`"
-        ;;
-
-    *)
-        echo "No match to get cc_version_info for $CC"
-        ;;
-esac
-
-fi
-
-# get fortran version info
-# check if the compiler_version_info is already set
-if test -z "$fc_version_info"; then
-case $FC in
-    *gfortran*)
-        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\
-            grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
-        ;;
-
-    *mpif90*)
-        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -v 2>&1 | grep 'version' |\
-            sed 's/^[a-z0-9]* for //' |\
-            sed 's/\"/\\\"/g' |\
-            sed 's/^\([a-z]* \)/ built with \1/1'`
-        fc_version_info=`echo $fc_version_info`
-        ;;
-
-    *ifx*)
-        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
-            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
-        ;;
-
-    *ifc*|*ifort*)
-        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
-            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
-        ;;
-
-    *f95*)
-        # Figure out which compiler we are using: pgf90 or Absoft f95
-        RM='rm -f'
-        tmpfile=/tmp/cmpver.$$
-        $FC -V >$tmpfile
-        if test -s "$tmpfile"; then 
-            if( grep -s 'Absoft' $tmpfile > /dev/null) then
-                FC_BASENAME=f95
-            fi 
-        fi
-        $RM $tmpfile
-        fc_version_info=`$FC -V | grep Absoft`
-        ;;
-
-    *g95*)
-        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\
-            grep 'GCC'` 
-        ;;
-
-    *pgf90*)
-        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'pgf90'`
-        ;;
-
-    *nvfortran*)
-        fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'nvfortran'`
-        ;;
-
-    *nagfor*|*nagftn*)
-        RM='rm -f'
-        tmpfile=/tmp/cmpver.$$
-        $FC -V >& $tmpfile
-        if test -s "$tmpfile"; then
-           if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
-               FC_BASENAME=nagfor
-           fi
-        fi
-        fc_version_info=`grep "NAG Fortran" $tmpfile`
-        $RM $tmpfile
-        echo "compiler '$FC' is $fc_version_info"
-	;;
-
-     *)
-        echo "No match to get fc_version_info for $FC"
-        ;;
-esac
-fi
-
-# get c++ version info
-# check if the compiler_version_info is already set
-if test -z "$cxx_version_info"; then
-case $CXX in
-    *nvc++*)
-        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'nvc++'`
-        ;;
-    *pgc++*)
-        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'pgc++'`
-        ;;
-    *g++*)
-        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
-            grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
-        ;;
-    *icpx*)
-        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
-            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
-        ;;
-    *icpc*)
-        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
-            sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
-        ;;
-    *mpicxx*)
-        cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -v 2>&1 | grep 'version' |\
-            sed 's/^[a-z0-9]* for //' |\
-            sed 's/^\([a-z]* \)/ built with \1/1'`
-        cxx_version_info=`echo $cxx_version_info`
-        ;; 
-
-    *clang++*)
-        cxx_version_info="`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
-            grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`"
-        ;;
-
-    *)
-        echo "No match to get cxx_version_info for $CXX"
-        ;;
-esac
-fi
diff --git a/config/linux-gnulibc2 b/config/linux-gnulibc2
deleted file mode 100644
index f1433bf02b..0000000000
--- a/config/linux-gnulibc2
+++ /dev/null
@@ -1,21 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://www.hdfgroup.org/licenses.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# Same as with gnulibc1 for now
-. $srcdir/config/linux-gnulibc1