From: Eric Anholt <eric@anholt.net>
Date: Wed, 18 Jan 2012 19:27:24 +0000 (-0800)
Subject: autoconf: Fix build of dri symbols test to not manually link expat.
X-Git-Tag: 062012170305~1996
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36473395f1e7574fc22fd4f5210ad6a8def76d91;p=profile%2Fivi%2Fmesa.git

autoconf: Fix build of dri symbols test to not manually link expat.

AC_CHECK_LIB has this nasty behavior, like the cflags tests, of
automatically putting the tested value into the global LIBS on
success.  This caused -lexpat to end up in LIBS, but without the
--with-expat dir, so my 32-bit build on a 64 system using expat from a
custom prefix could only find the system expat and fail to link on the
one current consumer of the LIBS variable: the dri driver test link.

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

diff --git a/configure.ac b/configure.ac
index c76af5b..b15a4bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1231,8 +1231,10 @@ if test "x$enable_dri" = xyes; then
             EXPAT_LIB="-L$withval/$LIB_DIR -lexpat"
             ])
         AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])
+	save_LIBS="$LIBS"
         AC_CHECK_LIB([expat],[XML_ParserCreate],[],
             [AC_MSG_ERROR([Expat required for DRI.])])
+	LIBS="$save_LIBS"
     fi
 
     # libdrm is required for all except swrast