gtest: disable tr1/tuple

Not all compilers are supporting tr1/tuple. This forces libgtest to use
an internal implementation of tuple. Alternatively, the newer 1.6
version of gtest may correctly handle this case automatically.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 6f6a17e9fad74ab6d7b602191c85be8b6af64890..ba1d3dc08e3f33fba3c0f5977ed8f449faa1ddc3 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -55,7 +55,8 @@ AM_COMMON_CPPFLAGS = \
        -D__STDC_FORMAT_MACROS \
        -D_GNU_SOURCE \
        -DCEPH_LIBDIR=\"${libdir}\" \
-       -DCEPH_PKGLIBDIR=\"${pkglibdir}\"
+       -DCEPH_PKGLIBDIR=\"${pkglibdir}\" \
+       -DGTEST_HAS_TR1_TUPLE=0
 
 AM_COMMON_CFLAGS = \
        -Wall \

diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am
index 8622e0a5935137a13a0be168176c1b0b7c3013b4..435177d69806e3e73d343c6d27b26ed43ee6cc3e 100644 (file)
--- a/src/gtest/Makefile.am
+++ b/src/gtest/Makefile.am
@@ -169,7 +169,7 @@ EXTRA_DIST += $(m4data_DATA)
 
 # We define the global AM_CPPFLAGS as everything we compile includes from these
 # directories.
-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include -DGTEST_HAS_TR1_TUPLE=0
 
 # Modifies compiler and linker flags for pthreads compatibility.
 if HAVE_PTHREADS