summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--auto/zlib23
-rwxr-xr-xconfigure5
2 files changed, 26 insertions, 2 deletions
diff --git a/auto/zlib b/auto/zlib
new file mode 100644
index 00000000..dab30d38
--- /dev/null
+++ b/auto/zlib
@@ -0,0 +1,23 @@
+
+# Copyright (C) Alejandro Colomar
+# Copyright (C) NGINX, Inc.
+
+
+NXT_ZLIB_CFLAGS="$(pkgconf --cflags-only-I zlib 2>/dev/null || echo "")"
+NXT_ZLIB_LIBS="$(pkgconf --libs zlib 2>/dev/null || echo "-lz")"
+
+
+nxt_feature="zlib"
+nxt_feature_name=NXT_HAVE_ZLIB
+nxt_feature_run=no
+nxt_feature_incs=$NXT_ZLIB_CFLAGS
+nxt_feature_libs=$NXT_ZLIB_LIBS
+nxt_feature_test="#include <stdio.h>
+
+ #include <zlib.h>
+
+ int main(void) {
+ puts(zlibVersion());
+ return 0;
+ }"
+. auto/feature
diff --git a/configure b/configure
index 2cb4d457..befaad47 100755
--- a/configure
+++ b/configure
@@ -127,6 +127,7 @@ NXT_LIBRT=
. auto/unix
. auto/os/conf
. auto/ssltls
+. auto/zlib
if [ $NXT_REGEX = YES ]; then
. auto/pcre
@@ -168,11 +169,11 @@ END
NXT_LIB_AUX_CFLAGS="$NXT_OPENSSL_CFLAGS $NXT_GNUTLS_CFLAGS \\
$NXT_CYASSL_CFLAGS $NXT_POLARSSL_CFLAGS \\
- $NXT_PCRE_CFLAGS"
+ $NXT_PCRE_CFLAGS $NXT_ZLIB_CFLAGS"
NXT_LIB_AUX_LIBS="$NXT_OPENSSL_LIBS $NXT_GNUTLS_LIBS \\
$NXT_CYASSL_LIBS $NXT_POLARSSL_LIBS \\
- $NXT_PCRE_LIB"
+ $NXT_PCRE_LIB $NXT_ZLIB_LIBS"
if [ $NXT_NJS != NO ]; then
. auto/njs