From: Matt Turner <mattst88@gmail.com>
Date: Mon, 22 Apr 2013 18:50:29 +0000 (-0700)
Subject: build: Rename PIPE_LOADER_HAVE_XCB to HAVE_PIPE_LOADER_XCB.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=242809942fd54b23a61fffdd0b1ba443f11c2bf6;p=mesa.git

build: Rename PIPE_LOADER_HAVE_XCB to HAVE_PIPE_LOADER_XCB.

For consistency, since we already have HAVE_PIPE_LOADER_{SW,DRM}.

Tested-by: Tom Stellard <thomas.stellard@amd.com>
Tested-by: Aaron Watry <awatry@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/configure.ac b/configure.ac
index 6cf7b2d6137..7cad3cba9cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1926,7 +1926,7 @@ if test "x$enable_gallium_loader" = xyes; then
         PKG_CHECK_MODULES([GALLIUM_PIPE_LOADER_XCB], [xcb xcb-dri2],
                           pipe_loader_have_xcb=yes, pipe_loader_have_xcb=no)
         if test "x$pipe_loader_have_xcb" = xyes; then
-            GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DPIPE_LOADER_HAVE_XCB"
+            GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XCB"
             GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS $GALLIUM_PIPE_LOADER_XCB_LIBS $LIBDRM_LIBS"
         fi
     fi
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index 6dedc413989..339d7bf10b6 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -35,7 +35,7 @@
 #include <libudev.h>
 #include <xf86drm.h>
 
-#ifdef PIPE_LOADER_HAVE_XCB
+#ifdef HAVE_PIPE_LOADER_XCB
 
 #include <xcb/dri2.h>
 
@@ -133,7 +133,7 @@ static struct pipe_loader_ops pipe_loader_drm_ops;
 static void
 pipe_loader_drm_x_auth(int fd)
 {
-#if PIPE_LOADER_HAVE_XCB
+#if HAVE_PIPE_LOADER_XCB
    /* Try authenticate with the X server to give us access to devices that X
     * is running on. */
    xcb_connection_t *xcb_conn;