Merge branch 'v2.8' into v2.9

lab-cosmo · Apr 19, 2024 · e5b5370 · e5b5370
2 parents 8a78b40 + a45eb99
commit e5b5370
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/configure b/configure
@@ -5124,9 +5124,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
   save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wredundant-delcs"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -Wredundant-delcs" >&5
-$as_echo_n "checking whether $CXX accepts -Wredundant-delcs... " >&6; }
+  CXXFLAGS="$CXXFLAGS -Wredundant-decls"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -Wredundant-decls" >&5
+$as_echo_n "checking whether $CXX accepts -Wredundant-decls... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 

diff --git a/configure.ac b/configure.ac
@@ -425,7 +425,7 @@ then
   PLUMED_CHECK_CXXFLAG([-Wcast-qual])
   PLUMED_CHECK_CXXFLAG([-Wcast-align])
   PLUMED_CHECK_CXXFLAG([-Wconversion])
-  PLUMED_CHECK_CXXFLAG([-Wredundant-delcs])
+  PLUMED_CHECK_CXXFLAG([-Wredundant-decls])
   PLUMED_CHECK_CXXFLAG([-Wvariadic-macros])
   PLUMED_CHECK_CXXFLAG([-Wold-style-cast])
 fi