Module: Mesa Branch: master Commit: 87f723408b3f4c088dcb819e88922918ae064d72 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=87f723408b3f4c088dcb819e88922918ae064d72
Author: Grazvydas Ignotas <[email protected]> Date: Fri Dec 29 01:29:10 2017 +0200 android,configure,meson: define HAVE_ZLIB The next change wants to use some optional zlib functionality, however not all platforms currently use zlib. Based on earlier Jordan Justen's patches and their review feedback. Signed-off-by: Grazvydas Ignotas <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> --- Android.common.mk | 1 + configure.ac | 1 + meson.build | 1 + 3 files changed, 3 insertions(+) diff --git a/Android.common.mk b/Android.common.mk index d9f871c08c..52dc7bff3b 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -70,6 +70,7 @@ LOCAL_CFLAGS += \ -DHAVE_DLADDR \ -DHAVE_DL_ITERATE_PHDR \ -DHAVE_LINUX_FUTEX_H \ + -DHAVE_ZLIB \ -DMAJOR_IN_SYSMACROS \ -fvisibility=hidden \ -Wno-sign-compare diff --git a/configure.ac b/configure.ac index 79f275d391..e236a3c54f 100644 --- a/configure.ac +++ b/configure.ac @@ -906,6 +906,7 @@ AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"]) dnl Check for zlib PKG_CHECK_MODULES([ZLIB], [zlib >= $ZLIB_REQUIRED]) +DEFINES="$DEFINES -DHAVE_ZLIB" dnl Check for pthreads AX_PTHREAD diff --git a/meson.build b/meson.build index 77e4e894b2..ae31cdd657 100644 --- a/meson.build +++ b/meson.build @@ -943,6 +943,7 @@ endif # TODO: some of these may be conditional dep_zlib = dependency('zlib', version : '>= 1.2.3') +pre_args += '-DHAVE_ZLIB' dep_thread = dependency('threads') if dep_thread.found() and host_machine.system() != 'windows' pre_args += '-DHAVE_PTHREAD' _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
