[PATCH xorg-gtest 8/9] Rename XSERVER_LIBS to X11_LIBS

Peter Hutterer peter.hutterer at who-t.net
Mon Jul 2 22:48:20 PDT 2012


XSERVER implies this has to do with the server, but these are the client
libs.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 configure.ac         |    2 +-
 examples/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3dea940..6e9e458 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ XORG_DEFAULT_OPTIONS
 XORG_ENABLE_INTEGRATION_TESTS([yes])
 XORG_WITH_DOXYGEN
 
-PKG_CHECK_MODULES(XSERVER, x11)
+PKG_CHECK_MODULES(X11, x11)
  
 # Check for Google Test
 CHECK_GTEST
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4a3b633..49c133f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -27,7 +27,7 @@
 check_LIBRARIES = libgtest.a libxorg-gtest.a libxorg-gtest_main.a
 
 AM_CPPFLAGS = $(GTEST_CPPFLAGS)
-AM_CXXFLAGS = $(XSERVER_CFLAGS) $(BASE_CXXFLAGS)
+AM_CXXFLAGS = $(X11_CFLAGS) $(BASE_CXXFLAGS)
 
 # build googletest as static lib
 nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc
@@ -66,5 +66,5 @@ xorg_gtest_example_LDADD = \
 	libxorg-gtest.a \
 	libxorg-gtest_main.a \
 	-lpthread \
-	$(XSERVER_LIBS) \
+	$(X11_LIBS) \
 	$(EVEMU_LIBS)
-- 
1.7.10.2



More information about the xorg-devel mailing list