Patch to remove zlib.

Andreas Schneider asn at samba.org
Wed Jul 9 10:02:25 MDT 2014


On Wednesday 09 July 2014 11:05:38 Ira Cooper wrote:
> On Wed, Jul 9, 2014 at 11:01 AM, Jelmer Vernooij <jelmer at samba.org> wrote:
> > On Mon, Jul 07, 2014 at 12:46:47PM -0400, Ira Cooper wrote:
> > > Note: To apply it  unxz it then use git am --ignore-whitespace ,
> > 
> > otherwise
> > 
> > > you may have issues.  (xz was used to save the list a good bit of
> > 
> > space...
> > 
> > > it's over 500k gzipped.)
> > > 
> > > As far as why: I listened to metze/vl.  I disagree with them.
> > > 
> > > I believe that third party (non Samba Team developed) libraries do not
> > > belong in the tree.  They are asking for trouble long term, IMHO.
> > > 
> > > Consider this patch the first step down the path to cleaning up these
> > > libraries.
> > 
> > Thanks for working on this.  It'd be great to always rely on the system
> > zlib.
> > It reduces some overhead on us to support two configurations in waf (one
> > with
> > the bundled zlib and one with the system zlib), and keeping the zlib copy
> > up to
> > date. This is not a huge burden, but all the little bits help. :-)
> > 
> > You probably want to use something other than CHECK_BUNDLED_SYSTEM() to
> > detect zlib, since zlib is no longer bundled. CHECK_BUNDLED_SYSTEM() also
> > relies exclusively on pkg-config (at least so its docstring claims) to
> > find
> > zlib; are we ready to make pkg-config a mandatory dependency?
> 
> As far as pkg-config goes, I debated that myself.  I submitted this version
> with the lockdown in it.  If there is a waf check I can use instead I'm all
> ears.

Ira,

take a look at source3/wscript_configure_system_ncurses

For pkgconfig you need:

conf.check_cfg(package='zlib', args='--cflags --libs',                                                                                              
msg='Checking for zlib', uselib_store="ZLIB")


	-- andreas

-- 
Andreas Schneider                   GPG-ID: CC014E3D
Samba Team                             asn at samba.org
www.samba.org



More information about the samba-technical mailing list