diff options
| author | Lukas Larsson <[email protected]> | 2016-08-26 15:53:51 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-08-26 15:53:51 +0200 |
| commit | 85234b4069c9b75e3ae5ddf643b981d7428fb81f (patch) | |
| tree | aa52443a80eecf23664cf56ed74cb395cab5a96c /erts/configure.in | |
| parent | d017ade88b8fa39f57aee722dd2e2c5d82e8b262 (diff) | |
| parent | 6fe89e38d40132e6acac2233d45ea44da49d1021 (diff) | |
| download | otp-85234b4069c9b75e3ae5ddf643b981d7428fb81f.tar.gz otp-85234b4069c9b75e3ae5ddf643b981d7428fb81f.tar.bz2 otp-85234b4069c9b75e3ae5ddf643b981d7428fb81f.zip | |
Merge branch 'g-andrade/kernel/fetch_ztream_dictionary/PR-1139/OTP-13842'
* g-andrade/kernel/fetch_ztream_dictionary/PR-1139/OTP-13842:
Update preloaded modules
Specify min zlib ver on inflateGetDictionary doc
Skip inflateGetDictionary test case if unsupported
zlib: Only link inflateGetDictionary if available
zlib: Add test case for inflateGetDictionary
zlib: support extraction of inflation dictionary
Diffstat (limited to 'erts/configure.in')
| -rw-r--r-- | erts/configure.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/configure.in b/erts/configure.in index b1830979aa..9f3d267791 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -1359,6 +1359,8 @@ AC_ARG_ENABLE(builtin-zlib, Z_LIB= if test "x$enable_builtin_zlib" = "xyes"; then + AC_DEFINE(HAVE_ZLIB_INFLATEGETDICTIONARY, 1, + [Define if your zlib version defines inflateGetDictionary.]) AC_MSG_NOTICE([Using our own built-in zlib source]) else AC_MSG_CHECKING(for zlib 1.2.5 or higher) @@ -1385,6 +1387,11 @@ error AC_MSG_RESULT(no) ]) LIBS=$zlib_save_LIBS + +AC_MSG_CHECKING(for zlib inflateGetDictionary presence) +AC_SEARCH_LIBS(inflateGetDictionary, [z], + AC_DEFINE(HAVE_ZLIB_INFLATEGETDICTIONARY, 1, + [Define if your zlib version defines inflateGetDictionary.])) fi AC_SUBST(Z_LIB) |