aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-01-11 15:04:43 +0100
committerRickard Green <[email protected]>2018-01-11 15:04:43 +0100
commita5b047d1da2169f55f554e342ab5beca7931c820 (patch)
treed60b7653b5a01fc9e8ea670baed42f42055727ff
parent56a7fbfbaed864392ace346889f0a9300cf631cd (diff)
parenta5cbcbdb85d9da79186403eb1f05dd74fd02183b (diff)
downloadotp-a5b047d1da2169f55f554e342ab5beca7931c820.tar.gz
otp-a5b047d1da2169f55f554e342ab5beca7931c820.tar.bz2
otp-a5b047d1da2169f55f554e342ab5beca7931c820.zip
Merge branch 'maint'
* maint: Do not add -lz to LIBS; keep it in Z_LIB
-rw-r--r--erts/configure.in12
1 files changed, 8 insertions, 4 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 2f6043ee85..f15bb56435 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -1356,12 +1356,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)