Fix g++ version test

Desktop / LibreOffice - Tor Lillqvist [collabora.com] - 2 April 2014 09:12 UTC



###

diff --git a/configure.ac b/configure.ac
index cebff52..c4b86ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5394,14 +5394,14 @@ if test "$GXX" = "yes"; then
_gpp_version=`$CXX -dumpversion`
_gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'`

- if test "$_gpp_majmin" -lt "410"; then
- AC_MSG_ERROR([You need to use GNU C++ compiler version >= 4.1 to build LibreOffice.])
+ if test "$_gpp_majmin" -lt "401"; then
+ AC_MSG_ERROR([You need to use GNU C++ compiler version >= 4.1 to build LibreOffice, you have $_gpp_version.])
else
AC_MSG_RESULT([checked (g++ $_gpp_version)])
fi

dnl see https://code.google.com/p/android/issues/detail?id=41770
- if test "$_gpp_majmin" -ge "410"; then
+ if test "$_gpp_majmin" -ge "401"; then
glibcxx_threads=no
AC_LANG_PUSH([C++])
AC_REQUIRE_CPP

3ec4b90 Fix g++ version test
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Upstream: cgit.freedesktop.org

  • Share