From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 29 Mar 2012 22:31:55 +0000 (-0700)
Subject: tests/glx: Point at the imported copy of gtest
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d2bc18e4dd37892f2de0cf0cf4b9ed44cbc0cbc;p=mesa.git

tests/glx: Point at the imported copy of gtest

This is just in case there's one installed on the system.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Acked-by: Eric Anholt <eric@anholt.net>
---

diff --git a/tests/glx/Makefile.am b/tests/glx/Makefile.am
index b5cc0b001ab..f5581d638cc 100644
--- a/tests/glx/Makefile.am
+++ b/tests/glx/Makefile.am
@@ -1,7 +1,10 @@
-AM_CFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \
-	$(X11_CFLAGS) $(GTEST_CFLAGS)
-AM_CXXFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \
-	$(X11_CFLAGS) $(GTEST_CFLAGS)
+INC = \
+	-I$(top_builddir)/src/gtest/include \
+	-I$(top_builddir)/src/mapi \
+	-I$(top_builddir)/src/glx
+
+AM_CFLAGS = $(INC) $(X11_CFLAGS)
+AM_CXXFLAGS = $(INC) $(X11_CFLAGS)
 
 if HAVE_XCB_GLX_CREATE_CONTEXT
 TESTS = glx_unittest