make/jdk_generic_profile.sh

*** 376,380 ****
--- 376,399 ----
      export LLVM_CFLAGS
      export LLVM_LDFLAGS
      export LLVM_LIBS
    fi
  fi
+ 
+ # Export variables for system zlib
+ # ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
+ # link against zlib
+ pkgconfig=$(which pkg-config 2>/dev/null)
+ if [ -x "${pkgconfig}" ] ; then
+   if [ "${ZLIB_CFLAGS}" = "" ] ; then
+     ZLIB_CFLAGS=$("${pkgconfig}" --cflags zlib)
+   fi
+   if [ "${ZLIB_LIBS}" = "" ] ; then
+     ZLIB_LIBS=$("${pkgconfig}" --libs zlib)
+   fi
+ fi
+ if [ "${ZLIB_LIBS}" = "" ] ; then
+     ZLIB_LIBS="-lz"
+ fi
+ export ZLIB_CFLAGS
+ export ZLIB_LIBS
+