[Xorp-cvs] SF.net SVN: xorp:[11581] trunk/xorp/ospf/tests/SConscript

[bms_fbsd at users.sourceforge.net]

Revision: 11581
          http://xorp.svn.sourceforge.net/xorp/?rev=11581&view=rev
Author:   bms_fbsd
Date:     2009-11-26 17:39:12 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
OSPF tests need to link against XRL target base shims for OSPF,
when shared=true.

Modified Paths:
--------------
    trunk/xorp/ospf/tests/SConscript

Modified: trunk/xorp/ospf/tests/SConscript
===================================================================
--- trunk/xorp/ospf/tests/SConscript	2009-11-26 17:17:20 UTC (rev 11580)
+++ trunk/xorp/ospf/tests/SConscript	2009-11-26 17:39:12 UTC (rev 11581)
@@ -21,6 +21,7 @@
 Import("env")
 
 env = env.Clone()
+is_shared = env.has_key('SHAREDLIBS')
 
 env.AppendUnique(CPPPATH = [
 	'#',
@@ -43,9 +44,6 @@
 	])
 
 env.AppendUnique(LIBS = [
-	'ospf',
-	#'ospfv2base',
-	#'ospfv3base',
 	'ribxif',
 	'findereventnotifierxif',
 	'feaclient',
@@ -62,6 +60,17 @@
 	'comm',
 	])
 
+# XXX Do we need to link against this now?
+if is_shared:
+    env.PrependUnique(LIBS = [
+	'ospfv2base',
+	'ospfv3base',
+    ])
+
+env.PrependUnique(LIBS = [
+	'ospf',
+])
+
 # XXX NOTYET: compound test; two modules, one test scaffold, run from
 # test_routing.py.
 #'build_lsa', 'build_lsa_main'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.