From: Eric Anholt <eric@anholt.net>
Date: Fri, 3 Feb 2012 04:28:14 +0000 (+0100)
Subject: mesa: Fix xcb-dri2 link flags leaking into LIBS.
X-Git-Tag: android-x86-4.4-r1~7155
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b3c84a80cd7f6d7d6796cb196422c7be44ea47aa;p=android-x86%2Fexternal-mesa.git

mesa: Fix xcb-dri2 link flags leaking into LIBS.

Fixes the build of builtin_compiler on my 32-bit build where xcb-dri2
is in a custom prefix but the custom prefix flags weren't available.
It shouldn't have been in LIBS anyway.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/configure.ac b/configure.ac
index 316c715f0c7..e859d4cc6f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1415,8 +1415,10 @@ if test "x$enable_egl" = xyes; then
                 EGL_DRIVER_DRI2=dri2
                 DEFINES="$DEFINES -DHAVE_XCB_DRI2"
                 # workaround a bug in xcb-dri2 generated by xcb-proto 1.6
+		save_LIBS="$LIBS"
                 AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [],
                           [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"])
+		LIBS="$save_LIBS"
             fi
 	fi