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

diff --git a/configs/autoconf.in b/configs/autoconf.in
index c7611a6f7812105a7fe5f3da43b1288aa2fef7c8..305a3a4c3f7c0ae00981084315b40beebb7a5943 100644 (file)
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -34,6 +34,9 @@ LLVM_LIBS = @LLVM_LIBS@
 GLW_CFLAGS = @GLW_CFLAGS@
 GLUT_CFLAGS = @GLUT_CFLAGS@
 
+TALLOC_LIBS = @TALLOC_LIBS@
+TALLOC_FLAGS = @TALLOC_CFLAGS@
+
 # dlopen
 DLOPEN_LIBS = @DLOPEN_LIBS@
 

diff --git a/configs/default b/configs/default
index cdfa811b103ad019b891056b8b234c2b02996dd0..043579642972e8dc12dec9c76bd536d4e8cf49c6 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -82,6 +82,9 @@ GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)*
 GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*
 VG_LIB_GLOB = $(VG_LIB_NAME)*
 
+TALLOC_LIBS = `pkg-config --libs talloc`
+TALLOC_CFLAGS = `pkg-config --cflags talloc`
+
 # Optional assembly language optimization files for libGL
 MESA_ASM_SOURCES = 
 
@@ -116,7 +119,7 @@ EGL_CLIENT_APIS = $(GL_LIB)
 
 # Library dependencies
 #EXTRA_LIB_PATH ?=
-GL_LIB_DEPS     = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -ltalloc -lstdc++
+GL_LIB_DEPS     = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread $(TALLOC_LIBS) -lstdc++
 EGL_LIB_DEPS    = $(EXTRA_LIB_PATH) -ldl -lpthread
 OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm

diff --git a/configure.ac b/configure.ac
index 3d86decadaf5aab34478bb519f1d0fa6cbfd445d..b2c6b52d2eed11147e97cfd3434d68b31e1f6c41 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -464,6 +464,8 @@ xxlib|xdri|xosmesa)
 esac
 
 PKG_CHECK_MODULES([TALLOC], [talloc])
+AC_SUBST([TALLOC_LIBS])
+AC_SUBST([TALLOC_CFLAGS])
 
 dnl
 dnl Driver specific build directories

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 1d200b47b40b3458d01e34422fd2a1161829f2a7..fef389162a03755cf009997f61448bc1fb018632 100644 (file)
--- 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 \