# HG changeset patch # User Hajime Tazaki # Date 1389308878 -32400 # Node ID fab0397aa9a492cc5a9a3183326a1d08c017e707 # Parent 17ca4464ade98e14fbd4fa39b73e206b7ecb79c8 Bug 1828 - Tests and examples do not compile when sctp-tools is not enabled diff -r 17ca4464ade9 -r fab0397aa9a4 RELEASE_NOTES --- a/RELEASE_NOTES Thu Jan 09 16:47:04 2014 +0100 +++ b/RELEASE_NOTES Fri Jan 10 08:07:58 2014 +0900 @@ -33,6 +33,7 @@ ---------- - Bug 1713 - Ipv6 address configuration support for LinuxStackHelper - Bug 1827 - Linux SCTP support over DCE +- Bug 1828 - Tests and examples do not compile when sctp-tools is not enabled Release dce-1.2 ============= diff -r 17ca4464ade9 -r fab0397aa9a4 wscript --- a/wscript Thu Jan 09 16:47:04 2014 +0100 +++ b/wscript Fri Jan 10 08:07:58 2014 +0900 @@ -600,6 +600,10 @@ 'model/linux/linux-dccp-socket-factory-impl.cc', 'model/linux/linux-dccp6-socket-factory.cc', 'model/linux/linux-dccp6-socket-factory-impl.cc', + 'model/linux/linux-sctp-socket-factory.cc', + 'model/linux/linux-sctp-socket-factory-impl.cc', + 'model/linux/linux-sctp6-socket-factory.cc', + 'model/linux/linux-sctp6-socket-factory-impl.cc', # helper. 'helper/ipv4-dce-routing-helper.cc', 'helper/dce-manager-helper.cc', @@ -626,6 +630,8 @@ 'model/linux/linux-tcp6-socket-factory.h', 'model/linux/linux-dccp-socket-factory.h', 'model/linux/linux-dccp6-socket-factory.h', + 'model/linux/linux-sctp-socket-factory.h', + 'model/linux/linux-sctp6-socket-factory.h', 'helper/dce-manager-helper.h', 'helper/dce-application-helper.h', 'helper/ccn-client-helper.h', @@ -633,18 +639,6 @@ 'helper/linux-stack-helper.h', ] - if bld.env['SCTP_TOOLS_FOUND']: - module_source += [ - 'model/linux/linux-sctp-socket-factory.cc', - 'model/linux/linux-sctp-socket-factory-impl.cc', - 'model/linux/linux-sctp6-socket-factory.cc', - 'model/linux/linux-sctp6-socket-factory-impl.cc', - ] - module_headers += [ - 'model/linux/linux-sctp-socket-factory.h', - 'model/linux/linux-sctp6-socket-factory.h', - ] - module_source = module_source + kernel_source module_headers = module_headers + kernel_headers uselib = ns3waf.modules_uselib(bld, ['core', 'network', 'internet', 'netlink'])