diff options
| author | Eric Anholt <[email protected]> | 2010-08-22 17:34:18 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2010-08-22 17:36:51 -0700 |
| commit | 639cdd3782c40c422c33c907949376c735d9340c (patch) | |
| tree | 30914b597b3fa15ffe443cb37a41779bcef61673 /src/glsl | |
| parent | 8ffc3572281c24d1f97b3c119117918dca80f53e (diff) | |
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
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile index 1d200b47b40..fef389162a0 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 \ |