glx: Hook up the unit tests again using the internal gtest.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

tests/glx/Makefile.am

@@ -3,7 +3,6 @@ AM_CFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \
 AM_CXXFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \
 	$(X11_CFLAGS) $(GTEST_CFLAGS)
 
-if HAVE_GTEST
 if HAVE_XCB_GLX_CREATE_CONTEXT
 TESTS = glx_unittest
 check_PROGRAMS = glx_unittest
@@ -13,6 +12,9 @@ glx_unittest_SOURCES =			\
         create_context_unittest.cpp	\
         fake_glx_screen.cpp
 
-glx_unittest_LDADD = $(top_builddir)/src/glx/libglx.a $(GTEST_LIBS) -lgtest_main
-endif
+glx_unittest_LDADD = \
+	$(top_builddir)/src/glx/libglx.la \
+	$(top_builddir)/src/gtest/libgtest.la \
+	-lpthread
+
 endif