From: Willem Jan Withagen <wjw@digiware.nl>
Date: Wed, 4 May 2016 09:15:54 +0000 (+0200)
Subject: GTEST: Have FreeBSD use the TR1 code that comes with gtest.
X-Git-Tag: v11.0.0~547^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ad3b0836ae4bb4be05303f066076551925461f8;p=ceph.git

GTEST: Have FreeBSD use the TR1 code that comes with gtest.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index df225d684731..ddffbd70a032 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -85,11 +85,11 @@ AM_COMMON_CPPFLAGS = \
 	-D__STDC_FORMAT_MACROS \
 	-D_GNU_SOURCE \
 	-DCEPH_LIBDIR=\"${libdir}\" \
-	-DCEPH_PKGLIBDIR=\"${pkglibdir}\" \
-	-DGTEST_USE_OWN_TR1_TUPLE=0
+	-DCEPH_PKGLIBDIR=\"${pkglibdir}\" 
 
 if LINUX
 AM_COMMON_CPPFLAGS += \
+	-DGTEST_USE_OWN_TR1_TUPLE=0 \
 	-D_REENTRANT
 endif