[Libreoffice-commits] .: Branch 'libreoffice-3-4' - configure.in

[Thorsten Behrens]

 configure.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 06c6ac14944ba7df439e5915db0f95c0709ea3f9
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu May 5 16:47:57 2011 +0200

    Auto-accept ccache >= 3.1 on Mac
    
    The reason for the selective rejection of everything but a patched
    ccache on Mac was broken objective-c/c++ support and a memory
    corruption on arg parse - both are fixed on 3.0 and 3.1,
    respectively. See http://ccache.samba.org/releasenotes.html

diff --git a/configure.in b/configure.in
index 939d567..3646be8 100755
--- a/configure.in
+++ b/configure.in
@@ -2901,7 +2901,8 @@ elif test "$enable_ccache_skip" = "auto" ; then
       # check ccache version
       AC_MSG_CHECKING([whether version of ccache is suitable])
       CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
-      if test "$CCACHE_VERSION" = "2.4_OOo"; then
+      CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+      if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" -ge "030100"; then
          AC_MSG_RESULT([yes])
          AC_MSG_CHECKING([whether ccache is actually used for the build])
          AC_LANG_PUSH([C++])