Commit 81e21519 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.6' into v2.7

parents df4ad340 e367c116
......@@ -93,3 +93,9 @@ For developers:
- Added integer macros `PLUMED_VERSION_MAJOR` `PLUMED_VERSION_MINOR` and `PLUMED_VERSION_PATCH` to `config/version.h`.
Can be used to write \ref LOAD -able source code portable across multiple versions.
- Fix for compilation with GCC 11 (reported by Axel Kohlmeyer, see \issue{693}).
## Versions 2.6.5
For users:
- Fixed configure problem on XL compiler (see \issue{731}).
......@@ -9954,7 +9954,7 @@ do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ objects can be grouped with $test_LD_RO" >&5
$as_echo_n "checking whether C++ objects can be grouped with $test_LD_RO... " >&6; }
rm -f conftest-*
rm -f conftest*
cat << EOF > conftest-main.cpp
void f(void);
......@@ -9998,7 +9998,7 @@ do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether static libraries can be created with $test_AR_CR" >&5
$as_echo_n "checking whether static libraries can be created with $test_AR_CR... " >&6; }
rm -f conftest-*
rm -f conftest*
cat << EOF > conftest-main.cpp
void f(void);
......
......@@ -1088,7 +1088,7 @@ for test_LD_RO in "$($CXX --print-prog-name=ld) -r -o" "$CXX -Wl,-r -o" "ld -r -
do
AC_MSG_CHECKING([whether C++ objects can be grouped with $test_LD_RO])
rm -f conftest-*
rm -f conftest*
cat << EOF > conftest-main.cpp
void f(void);
......@@ -1129,7 +1129,7 @@ for test_AR_CR in "$($CXX --print-prog-name=ar) cr" "ar cr"
do
AC_MSG_CHECKING([whether static libraries can be created with $test_AR_CR])
rm -f conftest-*
rm -f conftest*
cat << EOF > conftest-main.cpp
void f(void);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment