svn merge ^/branches/released .

1 files changed, 11 insertions, 3 deletions

diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in
index 461e87ca3..ab3fe7dc4 100644
--- a/mesalib/configs/autoconf.in
+++ b/mesalib/configs/autoconf.in
@@ -16,10 +16,12 @@ PIC_FLAGS = @PIC_FLAGS@
 DEFINES = @DEFINES@

 API_DEFINES = @API_DEFINES@

 SHARED_GLAPI = @SHARED_GLAPI@

-CFLAGS = @CPPFLAGS@ @CFLAGS@ \

+CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \

 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)

-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \

+CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \

 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

+CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@

+CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@

 LDFLAGS = @LDFLAGS@

 EXTRA_LIB_PATH = @EXTRA_LIB_PATH@

 RADEON_CFLAGS = @RADEON_CFLAGS@

@@ -34,6 +36,8 @@ LLVM_LIBS = @LLVM_LIBS@
 GLW_CFLAGS = @GLW_CFLAGS@

 GLUT_CFLAGS = @GLUT_CFLAGS@

 GLX_TLS = @GLX_TLS@

+DRI_CFLAGS = @DRI_CFLAGS@

+DRI_CXXFLAGS = @DRI_CXXFLAGS@

 

 # dlopen

 DLOPEN_LIBS = @DLOPEN_LIBS@

@@ -107,7 +111,10 @@ GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)

 

 # Driver specific build vars

-DRI_DIRS = @DRI_DIRS@ 

+DRI_DIRS = @DRI_DIRS@

+DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@

+DRICORE_LIBS = @DRICORE_LIBS@

+DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@

 EGL_PLATFORMS = @EGL_PLATFORMS@

 EGL_CLIENT_APIS = @EGL_CLIENT_APIS@

 

@@ -137,6 +144,7 @@ GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@
 WAYLAND_EGL_LIB_DEPS = $(EXTRA_LIBPATH) @WAYLAND_EGL_LIB_DEPS@

 

 # DRI dependencies

+MESA_MODULES = @MESA_MODULES@

 DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@

 LIBDRM_CFLAGS = @LIBDRM_CFLAGS@

 LIBDRM_LIB = @LIBDRM_LIBS@