diff options
| author | Rickard Green <[email protected]> | 2018-01-11 15:04:03 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-01-11 15:04:03 +0100 |
| commit | a5cbcbdb85d9da79186403eb1f05dd74fd02183b (patch) | |
| tree | 225db7ab08dabf317a4e737c27e2c1d6fbf88721 | |
| parent | e9b753a03b7f0edc6f795e9c05cd3cca41c2011e (diff) | |
| parent | ac49ae5c99993cb312645c26d3f07efa4c668bc8 (diff) | |
| download | otp-a5cbcbdb85d9da79186403eb1f05dd74fd02183b.tar.gz otp-a5cbcbdb85d9da79186403eb1f05dd74fd02183b.tar.bz2 otp-a5cbcbdb85d9da79186403eb1f05dd74fd02183b.zip | |
Merge branch 'rickard/libs-libz/ERL-529/OTP-14840' into maint
* rickard/libs-libz/ERL-529/OTP-14840:
Do not add -lz to LIBS; keep it in Z_LIB
| -rw-r--r-- | erts/configure.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/erts/configure.in b/erts/configure.in index 913315e402..cbebca97a3 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -1507,12 +1507,16 @@ error ],[ AC_MSG_RESULT(no) ]) + +if test "$Z_LIB" != ""; then + 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 + 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) |