bug 316: make nsc compilation conditional again

src/internet-stack/internet-stack.cc

@@ -30,8 +30,10 @@
 #include "udp-socket-factory-impl.h"
 #include "tcp-socket-factory-impl.h"
 #include "ipv4-impl.h"
+#ifdef NETWORK_SIMULATION_CRADLE
 #include "nsc-tcp-socket-factory-impl.h"
 #include "nsc-tcp-l4-protocol.h"
+#endif
 
 namespace ns3 {
 
@@ -87,7 +89,7 @@ AddInternetStack (Ptr<Node> node)
   AddTcpStack (node);
 }
 
-
+#ifdef NETWORK_SIMULATION_CRADLE
 static void
 AddNscStack(Ptr<Node> node, const std::string &soname)
 {
@@ -111,5 +113,11 @@ AddNscInternetStack (Ptr<Node> node, const std::string &soname)
   AddUdpStack (node);
   AddNscStack (node, soname);
 }
-
+#else
+void
+AddNscInternetStack (Ptr<Node> node, const std::string &soname)
+{
+  NS_FATAL_ERROR ("NSC Not enabled on this platform.");
+}
+#endif
 }//namespace ns3

src/internet-stack/wscript

@@ -135,12 +135,7 @@ def build(bld):
         'pending-data.cc',
         'sequence-number.cc',
         'rtt-estimator.cc',
-        'nsc-tcp-socket-impl.cc',
-        'nsc-tcp-l4-protocol.cc',
-        'nsc-tcp-socket-factory-impl.cc',
-        'nsc-sysctl.cc',
         ]
-    obj.uselib = 'DL'
 
     headers = bld.create_obj('ns3header')
     headers.module = 'internet-stack'
@@ -155,5 +150,10 @@ def build(bld):
         ]
 
     if bld.env()['NSC_ENABLED']:        
+        obj.source.append ('nsc-tcp-socket-impl.cc')
+        obj.source.append ('nsc-tcp-l4-protocol.cc')
+        obj.source.append ('nsc-tcp-socket-factory-impl.cc')
+        obj.source.append ('nsc-sysctl.cc')
+        obj.uselib = 'DL'
         builddir = os.path.abspath(os.path.join(bld.env()['NS3_BUILDDIR'], bld.env ().variant()))
         NscBuildTask(builddir)