5470 libz should be part of illumos
1002 Integrate zlib

@@ -23,10 +23,11 @@
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright (c) 2012, Joyent, Inc. All rights reserved.
 # Copyright (c) 2013 Gary Mills
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
+# Copyright (c) 2015 Gary Mills
 
 include ../Makefile.master
 
 #       Note that libcurses installs commands along with its library.
 #       This is a minor bug which probably should be fixed.

@@ -262,10 +263,11 @@
         librstp         \
         libreparse      \
         libhotplug      \
         libfruutils     .WAIT   \
         libfru          \
+        zlib            \
         $($(MACH)_SUBDIRS)
 
 i386_SUBDIRS=           \
         libfdisk        \
         libsaveargs

@@ -499,10 +501,11 @@
         smhba           \
         libima          \
         libsun_ima      \
         mpapi           \
         libreparse      \
+        zlib            \
         $($(MACH)_HDRSUBDIRS)
 
 i386_HDRSUBDIRS=        \
         libfdisk        \
         libsaveargs

@@ -638,11 +641,11 @@
 udapl/udapl_tavor:      udapl/libdat
 libzfs:         libdevid libgen libnvpair libuutil \
                 libadm libavl libefi libidmap libmd libzfs_core libm
 libzfs_core:    libnvpair
 libzfs_jni:     libdiskmgt libnvpair libzfs
-libzpool:       libavl libumem libnvpair libcmdutils
+libzpool:       libavl libumem libnvpair libcmdutils zlib
 libsec:         libavl libidmap
 brand:          libc libsocket
 libshare:       libscf libzfs libuuid libfsmgt libsecdb libumem libsmbfs
 libexacct/demo: libexacct libproject libsocket libnsl
 libtsalarm:     libpcp