--- old/make/autoconf/lib-bundled.m4	2018-02-05 14:28:51.000000000 -0800
+++ new/make/autoconf/lib-bundled.m4	2018-02-05 14:28:51.000000000 -0800
@@ -209,7 +209,15 @@
     AC_MSG_ERROR([Invalid value for --with-zlib: ${with_zlib}, use 'system' or 'bundled'])
   fi
 
+  if test "x$USER_EXTERNAL_LIBZ" = "xfalse"; then
+    LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
+  else
+    LIBZ_LIBS="-lz"
+  fi
+
   AC_SUBST(USE_EXTERNAL_LIBZ)
+  AC_SUBST(LIBZ_CFLAGS)
+  AC_SUBST(LIBZ_LIBS)
 ])
 
 ################################################################################