diff options
| author | Grazvydas Ignotas <[email protected]> | 2017-12-29 01:29:10 +0200 |
|---|---|---|
| committer | Grazvydas Ignotas <[email protected]> | 2018-01-14 18:52:23 +0200 |
| commit | 87f723408b3f4c088dcb819e88922918ae064d72 (patch) | |
| tree | 0f0754f51568633b07a751539d93e016bdfa8484 | |
| parent | b7347cc3131685591f90eb94f6362a679307067e (diff) | |
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]>
| -rw-r--r-- | Android.common.mk | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | meson.build | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk index d9f871c08c7..52dc7bff3be 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 79f275d3914..e236a3c54f6 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 77e4e894b23..ae31cdd6571 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' |