[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 16:29:48
Message-ID: 1136910588.695989.2578.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 496499 by chehrlic:

don't use pkgconfig for bz2, jpeg, tiff and z because they don't support it
sync openssl.py with libpng.py
add INCLUDES_libfoo to options

 M  +4 -1      libbz2.py  
 M  +4 -1      libjpeg.py  
 M  +1 -0      libpng.py  
 M  +4 -1      libtiff.py  
 M  +4 -1      libz.py  
 M  +28 -42    openssl.py  


--- trunk/KDE/kdelibs/bksys/libbz2.py #496498:496499
@@ -17,6 +17,7 @@
 		('CCFLAGS_BZ2',''),
 		('LINKFLAGS_BZ2',''),
 		('CPPPATH_BZ2',''),
+		('INCLUDES_BZ2',''),
 		('LIB_BZ2',''),
 		('LIBPATH_BZ2',''),
 		)
@@ -27,7 +28,9 @@
 		pkgs.generate(env)
 
 		have_lib = 0
-		if env['HAVE_PKGCONFIG'] == 0:
+# bzip2 has no pkgconfig support
+#		if env['HAVE_PKGCONFIG'] == 0:
+		if 1:
 			conf = env.Configure()
 			if conf.CheckHeader('bzlib.h'):
 				if conf.CheckLib('bz2'):
--- trunk/KDE/kdelibs/bksys/libjpeg.py #496498:496499
@@ -18,6 +18,7 @@
 		('CCFLAGS_JPEG',''),
 		('LINKFLAGS_JPEG',''),
 		('CPPPATH_JPEG',''),
+		('INCLUDES_JPEG',''),
 		('LIB_JPEG',''),
 		('LIBPATH_JPEG',''),
 		)
@@ -28,7 +29,9 @@
 		pkgs.generate(env)
 
 		have_lib = 0
-		if env['HAVE_PKGCONFIG'] == 0:
+# jpeg has no pkgconfig support
+#		if env['HAVE_PKGCONFIG'] == 0:
+		if 1:
 	 		conf = env.Configure()
 			if conf.CheckHeader(['stdio.h','jpeglib.h']):
 				if conf.CheckLib('jpeg'):
--- trunk/KDE/kdelibs/bksys/libpng.py #496498:496499
@@ -18,6 +18,7 @@
 		('CCFLAGS_PNG',''),
 		('LINKFLAGS_PNG',''),
 		('CPPPATH_PNG',''),
+		('INCLUDES_PNG',''),
 		('LIB_PNG',''),
 		('LIBPATH_PNG',''),
 		)
--- trunk/KDE/kdelibs/bksys/libtiff.py #496498:496499
@@ -17,6 +17,7 @@
 		('CCFLAGS_TIFF',''),
 		('LINKFLAGS_TIFF',''),
 		('CPPPATH_TIFF',''),
+		('INCLUDES_TIFF',''),
 		('LIB_TIFF',''),
 		('LIBPATH_TIFF','')
 		)
@@ -27,7 +28,9 @@
 		pkgs.generate(env)
 
 		have_lib = 0
-		if env['HAVE_PKGCONFIG'] == 0:
+# tiff has no pkgconfig support
+#		if env['HAVE_PKGCONFIG'] == 0:
+		if 1:
 			conf = env.Configure()
 			if conf.CheckHeader('tiff.h'):
 				if conf.CheckLib('tiff'):
--- trunk/KDE/kdelibs/bksys/libz.py #496498:496499
@@ -18,6 +18,7 @@
 		('CCFLAGS_Z',''),
 		('LINKFLAGS_Z',''),
 		('CPPPATH_Z',''),
+		('INCLUDES_Z',''),
 		('LIB_Z',''),
 		('LIBPATH_Z','')
 		)
@@ -28,7 +29,9 @@
 		pkgs.generate(env)
 
 		have_lib = 0
-		if env['HAVE_PKGCONFIG'] == 0:
+# zlib has no pkgconfig support
+#		if env['HAVE_PKGCONFIG'] == 0:
+		if 1:
 			conf = env.Configure()
 			if conf.CheckHeader('zlib.h'):
 				if conf.CheckLib('z'):
--- trunk/KDE/kdelibs/bksys/openssl.py #496498:496499
@@ -1,65 +1,51 @@
 # Copyright liucougar 2005
 # BSD license (see COPYING)
 
-"""
-Find and load the openssl necessary compilation and link flags
-"""
-
 def exists(env):
 	return true
 
-
 def generate(env):
 
-	def Check_openssl(context):
-		import SCons.Util
-		ret = 0
-
-		context.Message('Checking for openssl... ')
-		if env['CC'] == 'gcc': 
-			if env.find_file('opensslconf.h',['c:\openssl\include\openssl']):
-				env['CACHED_OPENSSL']  = 1
-				env['CPPPATH_OPENSSL'] = ['c:\\openssl\\include']
-				env['LIBPATH_OPENSSL'] = ['c:\\openssl\\lib\\mingw']
-				env['LIB_OPENSSL']	   = ['eay32']
-				ret = 1
-		context.Result(ret)
-		return ret
-
 	from SCons.Options import Options
+	from SCons.Tool import Tool
+	import os
 
 	optionFile = env['CACHEDIR'] + 'openssl.cache.py'
 	opts = Options(optionFile)
 	opts.AddOptions(
 		('CACHED_OPENSSL', 'Whether openssl is available'),
+		('CXXFLAGS_OPENSSL',''),
+		('CCFLAGS_OPENSSL',''),
+		('LINKFLAGS_OPENSSL',''),
 		('CPPPATH_OPENSSL',''),
-		('LIBPATH_OPENSSL',''),
+		('INCLUDES_OPENSSL',''),
 		('LIB_OPENSSL',''),
+		('LIBPATH_OPENSSL','')
 		)
 	opts.Update(env)
+
 	if not env['HELP'] and (env['_CONFIGURE_'] or not env.has_key('CACHED_OPENSSL')):
+		pkgs = Tool('pkgconfig', ['./bksys'])
+		pkgs.generate(env)
 
-		if env['WINDOWS']:
-			conf = env.Configure(custom_tests =	 { 'Check_openssl' : Check_openssl} )
-			have_openssl = conf.Check_openssl()
+		have_lib = 0
+		if env['HAVE_PKGCONFIG'] == 0:
+			conf = env.Configure()
+			if conf.CheckHeader('opensslconf.h'):
+				if conf.CheckLib('eay32'):
+					conf.env['INCLUDES_OPENSSL'] = ['']
+					conf.env['LIB_OPENSSL']      = ['eay32']
+					have_lib = 1
+				elif conf.CheckLib('libeay32'):
+					conf.env['INCLUDES_OPENSSL'] = ['']
+					conf.env['LIB_OPENSSL']      = ['libeay32']
+					have_lib = 1
 			env = conf.Finish()
-	
 		else:
-			from SCons.Tool import Tool
-			import os
-			pkgs = Tool('pkgconfig', ['./bksys'])
-			pkgs.generate(env)
-	
-			# TODO this will not work on opensuse 10 (ita) openssl-devel not installed
-			have_openssl = env.pkgConfig_findPackage('OPENSSL', 'openssl', '0.9.6')
-	
-		dest=open(env.join(env['_BUILDDIR_'], 'ksslconfig.h'), 'w')
-		dest.write('/* openssl configuration created by bksys */\n')
-		if have_openssl: dest.write('#define KSSL_HAVE_SSL 1\n');
-		dest.close()
-		#env['_CONFIG_H_'].append('openssl')
-	
-		if not have_openssl: 
-				print 'openssl not found.'
+			have_lib = env.pkgConfig_findPackage('OPENSSL', 'openssl', '0.9.6')
 
-		opts.Save(optionFile, env)
+		env.write_lib_header( 'openssl', have_lib, False, 'ksslconfig.h', '#define KSSL_HAVE_SSL 1\n' )
+# using another header name than config-%s.h doesn't work because of env.write_config_h()
+		env.write_lib_header( 'openssl', have_lib, False )
+
+	opts.Save(optionFile, env)
[prev in list] [next in list] [prev in thread] [next in thread]