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

List:       kde-commits
Subject:    KDE/kdelibs/bksys
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2006-01-10 19:23:44
Message-ID: 1136921024.346336.7249.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 496546 by chehrlic:

cleanup libagg.py & libpcre.py
fix libpng.py


 M  +18 -29    libagg.py  
 M  +4 -10     libpcre.py  
 M  +4 -4      libpng.py  


--- trunk/KDE/kdelibs/bksys/libagg.py #496545:496546
@@ -7,49 +7,38 @@
 def generate(env):
 
 	from SCons.Options import Options
+	from SCons.Tool import Tool
 	import os
 
 	optionFile = env['CACHEDIR'] + 'libagg.cache.py'
 	opts = Options(optionFile)
 	opts.AddOptions(
-		('CACHED_AGG','Whether libagg is available'),
+		('CACHED_AGG', 'Whether libagg is available'),
+		('CXXFLAGS_AGG',''),
+		('CCFLAGS_AGG',''),
 		('LINKFLAGS_AGG',''),
-		('LIB_AGG','')
-		# other options are added by the pkgConfig_findPackage() call
-		# apparently not, because the above LINKFLAGS_AGG line had to be added
-		# to make things work when attempting to use agg on linux. (mattr)
+		('CPPPATH_AGG',''),
+		('INCLUDES_AGG',''),
+		('LIB_AGG',''),
+		('LIBPATH_AGG',''),
 		)
 	opts.Update(env)
-	opts.Save(optionFile, env)
 
 	if not env['HELP'] and (env['_CONFIGURE_'] or not env.has_key('CACHED_AGG')):
+		pkgs = Tool('pkgconfig', ['./bksys'])
+		pkgs.generate(env)
 
-		env['CACHED_AGG'] = 0
-
-		if env['WINDOWS']:
+		have_lib = 0
+		if env['HAVE_PKGCONFIG'] == 0:
 			conf = env.Configure()
-			have_agg = conf.CheckLib('agg')
-			if have_agg:
-				env['LIB_AGG'] = ['agg']
-				env['CACHED_AGG'] = 1
+			if conf.CheckLib('png'):
+				conf.env['INCLUDES_AGG'] = [ '' ]
+				conf.env['LIB_AGG']      = [ 'agg' ]
+				have_lib = 1
 			env = conf.Finish()
 		else:
-			from SCons.Tool import Tool
-			pkgs = Tool('pkgconfig', ['./bksys'])
-			pkgs.generate(env)
-			have_agg = env.pkgConfig_findPackage('AGG', 'libagg', '2.3')
-			# env['xxx_AGG'] options are set now
+			have_lib = env.pkgConfig_findPackage('AGG', 'libagg', '2.3')
 
-		if have_agg:
-			dest=open(env.join(env['_BUILDDIR_'], 'config-libagg.h'), 'w')
-			dest.write('/* libagg configuration created by bksys */\n')
-			dest.write('#define HAVE_LIBAGG 1\n');
-			env['CACHED_AGG'] = 1
-			dest.close()
-			env['_CONFIG_H_'].append('libagg')
-		else:
-			env.pprint('RED', 'libagg >= 2.3 not found.')
+		env.write_lib_header( 'libagg', have_lib, False )
 
-	
-	opts.Update(env)
 	opts.Save(optionFile, env)
--- trunk/KDE/kdelibs/bksys/libpcre.py #496545:496546
@@ -44,14 +44,8 @@
 		else:
 			conf.Check_libpcre()
 
-		if env['CACHED_PCRE']:
-			dest=open(env.join(env['_BUILDDIR_'], 'config-libpcre.h'), 'w')
-			dest.write('/* libpcre configuration created by bksys */\n')
-			dest.write('#define HAVE_PCREPOSIX 1\n');
-			dest.close()
-			env['_CONFIG_H_'].append('libpcre')
-		else:
-			print 'libpcre not found .'
-
 		env = conf.Finish()
-		opts.Save(optionFile, env)
+
+		env.write_lib_header( 'libpcre', env['CACHED_PCRE'], False )
+
+	opts.Save(optionFile, env)
--- trunk/KDE/kdelibs/bksys/libpng.py #496545:496546
@@ -33,12 +33,12 @@
 			conf = env.Configure()
 			if conf.CheckHeader('png.h'):
 				if conf.CheckLib('png'):
-					conf.env['INCLUDES_Z'] = [ 'png.h' ]
-					conf.env['LIB_Z']      = [ 'png' ]
+					conf.env['INCLUDES_PNG'] = [ 'png.h' ]
+					conf.env['LIB_PNG']      = [ 'png' ]
 					have_lib = 1
 				elif conf.CheckLib('libpng'):
-					conf.env['INCLUDES_Z'] = [ 'png.h' ]
-					conf.env['LIB_Z']      = [ 'libpng' ]
+					conf.env['INCLUDES_PNG'] = [ 'png.h' ]
+					conf.env['LIB_PNG']      = [ 'libpng' ]
 					have_lib = 1
 			env = conf.Finish()
 		else:
[prev in list] [next in list] [prev in thread] [next in thread]