[Mesa-dev] [PATCH] configure.ac: Allowing building without shader cache without zlib.

Vinson Lee vlee at freedesktop.org
Sat Mar 4 22:13:31 UTC 2017


Fixes: 85a9b1b562b6 ("util/disk_cache: compress individual cache entries")
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
---
 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 943bc05adcd6..3526849b6dd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -786,7 +786,7 @@ dnl See if posix_memalign is available
 AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
 
 dnl Check for zlib
-PKG_CHECK_MODULES([ZLIB], [zlib >= $ZLIB_REQUIRED])
+PKG_CHECK_MODULES([ZLIB], [zlib >= $ZLIB_REQUIRED], [DEFINES="$DEFINES -DENABLE_SHADER_CACHE"], [:])
 
 dnl Check for pthreads
 AX_PTHREAD
@@ -1807,7 +1807,6 @@ if test -n "$with_vulkan_drivers"; then
 fi
 
 
-DEFINES="$DEFINES -DENABLE_SHADER_CACHE"
 AM_CONDITIONAL(NEED_MEGADRIVER, test -n "$DRI_DIRS")
 AM_CONDITIONAL(NEED_LIBMESA, test "x$enable_glx" = xxlib -o \
                                   "x$enable_osmesa" = xyes -o \
-- 
2.12.0



More information about the mesa-dev mailing list