[ekg2-commit] r4630 - trunk: trunk/SConstruct

[SVN commit]

Author: peres
Date: 2008-09-14 10:17:16 +0200 (Sun, 14 Sep 2008)
New Revision: 4630

Modified:
   trunk/SConstruct
Log:

Restore old flags if test fails. This should fix fallbacks when one of optdeps ain't available.



Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2008-09-14 08:09:55 UTC (rev 4629)
+++ trunk/SConstruct	2008-09-14 08:17:16 UTC (rev 4630)
@@ -434,11 +434,17 @@
 					sdep.append(xdep)
 
 		for xdep in sdep:	# 'flags' will be nicely split by SCons, but 'libs' are nicer to write
+			old_libs = libs
+			old_flags = flags
+
 			have_it = ExtTest(xdep, ['libs', 'flags'])
 			if have_it:
 				if isopt or len(dep) > 1: # pretty-print optional and selected required (if more than one possibility)
 					optdeps.append('%s' % (xdep))
 				break
+			else:
+				libs = old_libs
+				flags = old_flags
 
 		if not have_it:
 			if isopt: