[ekg2-commit] r4272 - in trunk: . scons.d: +trunk/scons.d/openssl trunk/SConstruct

[SVN commit]

Author: peres
Date: 2008-08-10 01:11:47 +0200 (Sun, 10 Aug 2008)
New Revision: 4272

Added:
   trunk/scons.d/openssl
Modified:
   trunk/SConstruct
Log:

openssl support.

Removing that stupid exttest-cache. It'd be too hard to maintain, while checks are cached anyway.



Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2008-08-09 23:10:44 UTC (rev 4271)
+++ trunk/SConstruct	2008-08-09 23:11:47 UTC (rev 4272)
@@ -88,15 +88,10 @@
 	context.Result(ret)
 	return ret
 
-ExtTestsCache = {}
-
 def ExtTest(name, addexports = []):
-	if name in ExtTestsCache.keys():
-		return ExtTestsCache[name]
 	exports = ['conf', 'defines', 'env']
 	exports.extend(addexports)
 	ret = SConscript('scons.d/%s' % (name), exports)
-	ExtTestsCache[name] = ret
 	return ret
 
 opts = Options('options.cache')

Added: trunk/scons.d/openssl
===================================================================
--- trunk/scons.d/openssl	                        (rev 0)
+++ trunk/scons.d/openssl	2008-08-09 23:11:47 UTC (rev 4272)
@@ -0,0 +1,12 @@
+
+# openssl (optional in jabber, required by sim)
+
+Import('*')
+
+out = conf.PkgConfig('openssl', libs, ccflags, linkflags)
+
+# XXX: search for non pkg-config installation?
+
+Return('out')
+
+# vim:ts=4:sts=4:syntax=python