[ekg2-commit] r4275 - in trunk: . plugins/jabber: trunk/SConstruct trunk/plugins/jabber/SConscript

[SVN commit]

Author: peres
Date: 2008-08-10 01:28:10 +0200 (Sun, 10 Aug 2008)
New Revision: 4275

Modified:
   trunk/SConstruct
   trunk/plugins/jabber/SConscript
Log:

Support exclusive depends. This is useful in jabber, where both openssl & gnutls
can be used, and we don't want to link with both.



Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2008-08-09 23:22:19 UTC (rev 4274)
+++ trunk/SConstruct	2008-08-09 23:28:10 UTC (rev 4275)
@@ -184,12 +184,17 @@
 
 	optdeps = []
 	for dep in info['optdepends']:
-		have_it = ExtTest(dep, ['libs', 'ccflags', 'linkflags'])
+		if not isinstance(dep, list):
+			dep = [dep]
+		for xdep in dep: # exclusive depends
+			have_it = ExtTest(xdep, ['libs', 'ccflags', 'linkflags'])
+			if have_it:
+				optdeps.append('%s' % (xdep))
+				break
+
 		if not have_it:
 			print '[%s] Optional dependency not satisfied: %s' % (plugin, dep)
-			optdeps.append('-%s' % (dep))
-		else:
-			optdeps.append('%s' % (dep))
+			optdeps.append('-%s' % (' -'.join(dep)))
 
 	if not ccflags:
 		ccflags = ['']

Modified: trunk/plugins/jabber/SConscript
===================================================================
--- trunk/plugins/jabber/SConscript	2008-08-09 23:22:19 UTC (rev 4274)
+++ trunk/plugins/jabber/SConscript	2008-08-09 23:28:10 UTC (rev 4275)
@@ -5,7 +5,7 @@
 	'type':			'protocol',
 	'state':		'stable',
 	'depends':		['expat'],
-	'optdepends':	['gnutls', 'openssl', 'zlib']
+	'optdepends':	[['gnutls', 'openssl'], 'zlib']
 	}
 
 Return('plugin')