[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/bksys
From:       Matt Rogers <mattr () kde ! org>
Date:       2005-11-20 4:14:16
Message-ID: 1132460056.213070.12959.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 481688 by mattr:

Fix the libz checks so that they work on windows and
use a consistent way of defining that zlib is present



 M  +5 -2      libz.py  


--- trunk/KDE/kdelibs/bksys/libz.py #481687:481688
@@ -33,7 +33,11 @@
 	opts.AddOptions(
 		('CACHED_Z', 'Whether libz is available'),
 		('CXXFLAGS_Z',''),
-		('LINKFLAGS_Z','')
+		('CCFLAGS_Z',''),
+		('LINKFLAGS_Z',''),
+		('CPPPATH_Z',''),
+		('LIB_Z',''),
+		('LIBPATH_Z','')
 		)
 	opts.Update(env)
 	opts.Save(optionFile, env)
@@ -46,7 +50,6 @@
 		else:
 			env['CACHED_Z'] = 0
 			if conf.CheckHeader('zlib.h') and conf.CheckLib('z'):
-				env['CXXFLAGS_Z'] = ['-DHAVE_LIBZ']
 				env['LINKFLAGS_Z'] = ['-lz']
 				env['CACHED_Z'] = 1
 
[prev in list] [next in list] [prev in thread] [next in thread]