[Libreoffice-commits] core.git: 2 commits - configure.ac

[Tor Lillqvist]

 configure.ac |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 44405c95b63fcd4b8b594c47106a7491424cbc40
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 2 17:12:09 2014 +0300

    We use four column indentation steps in this file
    
    Change-Id: I52898b460669ce7afaaeef4d28f36883eb20effa

diff --git a/configure.ac b/configure.ac
index c4b86ff..3726dfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5402,23 +5402,23 @@ if test "$GXX" = "yes"; then
 
     dnl see https://code.google.com/p/android/issues/detail?id=41770
     if test "$_gpp_majmin" -ge "401"; then
-            glibcxx_threads=no
-            AC_LANG_PUSH([C++])
-            AC_REQUIRE_CPP
-            AC_MSG_CHECKING([whether $CXX is broken with boost.thread])
-            AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-                #include <bits/c++config.h>]],[[
-                #if !defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
-                && !defined(_GLIBCXX__PTHREADS) \
-                && !defined(_GLIBCXX_HAS_GTHREADS)
-                choke me
-                #endif
-            ]])],[AC_MSG_RESULT([yes])
-            glibcxx_threads=yes],[AC_MSG_RESULT([no])])
-            AC_LANG_POP([C++])
-            if test $glibcxx_threads = yes; then
-                  BOOST_CXXFLAGS="-D_GLIBCXX_HAS_GTHREADS"
-            fi
+        glibcxx_threads=no
+        AC_LANG_PUSH([C++])
+        AC_REQUIRE_CPP
+        AC_MSG_CHECKING([whether $CXX is broken with boost.thread])
+        AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+            #include <bits/c++config.h>]],[[
+            #if !defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
+            && !defined(_GLIBCXX__PTHREADS) \
+            && !defined(_GLIBCXX_HAS_GTHREADS)
+            choke me
+            #endif
+        ]])],[AC_MSG_RESULT([yes])
+        glibcxx_threads=yes],[AC_MSG_RESULT([no])])
+        AC_LANG_POP([C++])
+        if test $glibcxx_threads = yes; then
+              BOOST_CXXFLAGS="-D_GLIBCXX_HAS_GTHREADS"
+        fi
      fi
 fi
 AC_SUBST(BOOST_CXXFLAGS)
commit 3ec4b907991d62155801b42acff9d09417fe66ed
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 2 17:08:16 2014 +0300

    Fix g++ version test
    
    Change-Id: I03bb06ddda9f8d54fae926004f5cf55cf5846833

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