build: Adjust and test scenario template for ndnSIM 2.1 and minor fixes

Refs: #3138, #2663

.waf-tools/default-compiler-flags.py

@@ -99,17 +99,16 @@ class GccBasicFlags(CompilerFlags):
     """This class defines base flags that work for gcc and clang compiler"""
     def getDebugFlags(self, conf):
         flags = super(GccBasicFlags, self).getDebugFlags(conf)
-        flags['CXXFLAGS'] += ['-pedantic', '-Wall',
+        flags['CXXFLAGS'] += ['-Wall',
                               '-O0',
                               '-g3',
-                              '-Werror',
                               '-Wno-error=maybe-uninitialized', # Bug #1615
                              ]
         return flags
 
     def getOptimizedFlags(self, conf):
         flags = super(GccBasicFlags, self).getOptimizedFlags(conf)
-        flags['CXXFLAGS'] += ['-pedantic', '-Wall', '-O2', '-g']
+        flags['CXXFLAGS'] += ['-Wall', '-O2', '-g']
         return flags
 
 class GccFlags(GccBasicFlags):

wscript

@@ -40,8 +40,6 @@ def configure(conf):
         os.environ['PKG_CONFIG_PATH'] = ':'.join([
             '/usr/local/lib/pkgconfig',
             '/opt/local/lib/pkgconfig'])
-    conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'],
-                   uselib_store='NDN_CXX', mandatory=True)
 
     try:
         conf.check_ns3_modules(MANDATORY_NS3_MODULES)
@@ -68,7 +66,7 @@ def configure(conf):
         conf.define('NS3_ASSERT_ENABLE', 1)
 
 def build (bld):
-    deps = 'NDN_CXX ' + ' '.join (['ns3_'+dep for dep in MANDATORY_NS3_MODULES + OTHER_NS3_MODULES]).upper ()
+    deps =  ' '.join (['ns3_'+dep for dep in MANDATORY_NS3_MODULES + OTHER_NS3_MODULES]).upper ()
 
     common = bld.objects (
         target = "extensions",