On 08/27/2009 05:13 PM, J.T. Conklin wrote:
Ben Greear<[email protected]> writes:
I am trying to merge my patches into the new svn tree. I notice
that HAVE_NETLINK_SOCKET_ATTRIBUTE_RTA_TABLE is not #defined on
my system, even though it should be.
Perhaps this is something to do with scons? (The old CVS repo had
some related code in config.h, etc.
Anyone know how to go about fixing this?
Hi Ben,
Yes, this is related to the SCons conversion. It appears that we
missed this, and perhaps a few more, feature tests. It will have
to be "ported" from autoconf to SCons.
I wouldn't be surprised if we find more nits of this nature. As such,
I encourage everyone who has time to try out the current code to do
so, so we can shake things out quickly.
The attached patch seems to fix the problem for me.
Please apply it if you concur.
Thanks,
Ben
--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com
diff --git a/site_scons/config/allconfig.py b/site_scons/config/allconfig.py
index ea9a504..c1c7d9c 100644
--- a/site_scons/config/allconfig.py
+++ b/site_scons/config/allconfig.py
@@ -261,6 +261,17 @@ def DoAllConfig(env, conf, host_os):
conf.Define('HAVE_NETLINK_SOCKETS')
elif has_net_route_h and host_os != 'linux':
conf.Define('HAVE_ROUTING_SOCKETS')
+
+ if has_linux_netlink_h:
+ rta_nl_includes = []
+ for s in prereq_linux_rtnetlink_h:
+ rta_nl_includes.append("#include <%s>\n" % s)
+
+ rta_nl_includes.append("#include <linux/rtnetlink.h>\n");
+ rta_nl_includes = string.join(rta_nl_includes, '')
+ has_netlink_rta_table = conf.CheckDeclaration('RTA_TABLE',
rta_nl_includes)
+ if has_netlink_rta_table:
+ conf.Define('HAVE_NETLINK_SOCKET_ATTRIBUTE_RTA_TABLE')
# net stack: struct members
# XXX header conditionals for linux/bsd variants needed.
_______________________________________________
Xorp-hackers mailing list
[email protected]
http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-hackers
