--- configure
+++ configure
@@ -23035,7 +23035,6 @@
 clean_CPPFLAGS=$CPPFLAGS
 clean_LDFLAGS=$LDFLAGS
 clean_LIBS=$LIBS
-ZLIB_LIBS=""
 
 # Check whether --with-zlib was given.
 if test ${with_zlib+y}
@@ -23609,12 +23609,28 @@
 
 
 if test "$OPT_ZLIB" = "no"; then
+  ZLIB_LIBS=""
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5
 printf "%s\n" "$as_me: WARNING: zlib disabled" >&2;}
 else
   if test "$OPT_ZLIB" = "yes"; then
     OPT_ZLIB=""
   fi
+  
+ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then
+  CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
+  LIBS="$ZLIB_LIBS $LIBS"
+  HAVE_LIBZ="1"
+
+
+$as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+
+  AMFIXLIB="1"
+ else
+  ZLIB_LIBS=""
 
   if test -z "$OPT_ZLIB"; then

@@ -23903,6 +23903,7 @@
     LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE zlib"
     curl_zlib_msg="enabled"
   fi
+ fi
 fi
 
  if test x"$AMFIXLIB" = x1; then
--- configure.ac
+++ configure.ac
@@ -1302,19 +1302,31 @@
 clean_CPPFLAGS=$CPPFLAGS
 clean_LDFLAGS=$LDFLAGS
 clean_LIBS=$LIBS
-ZLIB_LIBS=""
+
 AC_ARG_WITH(zlib,
 AS_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH])
 AS_HELP_STRING([--without-zlib],[disable use of zlib]),
   [OPT_ZLIB="$withval"])
 
 if test "$OPT_ZLIB" = "no"; then
+  ZLIB_LIBS=""
   AC_MSG_WARN([zlib disabled])
 else
   if test "$OPT_ZLIB" = "yes"; then
     OPT_ZLIB=""
   fi
 
+ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then
+  CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
+  LIBS="$ZLIB_LIBS $LIBS"
+  HAVE_LIBZ="1"
+  AC_SUBST(HAVE_LIBZ)
+  AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file])
+  AC_DEFINE(HAVE_LIBZ, 1, [if zlib is available])
+  AMFIXLIB="1"
+ else
+  ZLIB_LIBS=""
+
   if test -z "$OPT_ZLIB"; then
     CURL_CHECK_PKGCONFIG(zlib)
 
@@ -1395,6 +1395,7 @@
     LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE zlib"
     curl_zlib_msg="enabled"
   fi
+ fi
 fi
 
 dnl set variable for use in automakefile(s)