This patch, when layered on top of my previous OLSR related patches,
lets the olsr/tools build as expected.
Thanks,
Ben
--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com
diff --git a/contrib/olsr/tools/SConscript b/contrib/olsr/tools/SConscript
index 4a4ac89..277049a 100644
--- a/contrib/olsr/tools/SConscript
+++ b/contrib/olsr/tools/SConscript
@@ -46,6 +46,7 @@ env.AppendUnique(LIBS = [
'xorp',
'proto',
'comm',
+ 'olsr4xif',
])
cleardbsrcs = [
@@ -62,13 +63,11 @@ printdb = env.Program(target = 'print_databases', source =
printdbsrcs)
olsrtoolpath = '$exec_prefix/contrib/olsr/tools'
-#env.Alias('install',
-# env.InstallProgram(olsrtoolpath, cleardb))
+env.Alias('install',
+ env.InstallProgram(olsrtoolpath, cleardb))
-#env.Alias('install',
-# env.InstallProgram(olsrtoolpath, printdb))
+env.Alias('install',
+ env.InstallProgram(olsrtoolpath, printdb))
-# This won't compile, can't find olsr4_xif.hh file, not sure what is supposed
to
-# create it --Ben
-#Default(cleardb, printdb)
+Default(cleardb, printdb)
Default()
diff --git a/xrl/interfaces/SConscript b/xrl/interfaces/SConscript
index 7208c29..79feb28 100644
--- a/xrl/interfaces/SConscript
+++ b/xrl/interfaces/SConscript
@@ -94,6 +94,9 @@ xifs = [
'vrrp.xif',
]
+if env['WITH_OLSR']:
+ xifs.append('olsr4.xif')
+
all_xif_libs = []
for xif in xifs:
_______________________________________________
Xorp-hackers mailing list
[email protected]
http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-hackers
