From 639cdd3782c40c422c33c907949376c735d9340c Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Sun, 22 Aug 2010 17:34:18 -0700
Subject: mesa: AC_SUBST the talloc libs/cflags so the ./configure results are
 saved.

I had used pkg-config from the Makefile because I didn't want to screw
around with the non-autoconf build, but that doesn't work because the
PKG_CONFIG_PATH or TALLOC_LIBS/TALLOC_CFLAGS that people set at
configure time needs to be respected and may not be present at build
time.

Bug #29585
---
 src/glsl/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/glsl/Makefile')

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 1d200b47b4..fef389162a 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -75,7 +75,7 @@ CXX_SOURCES = \
 
 LIBS = \
 	$(TOP)/src/glsl/libglsl.a \
-	$(shell pkg-config --libs talloc)
+	$(TALLOC_LIBS)
 
 APPS = glsl_compiler glcpp/glcpp
 
@@ -104,6 +104,7 @@ OBJECTS = \
 	$(CXX_SOURCES:.cpp=.o)
 
 INCLUDES = \
+	$(TALLOC_CFLAGS) \
 	-I. \
 	-I../mesa \
 	-I../mapi \
-- 
cgit v1.2.3