waf-1.6: Mac OSX and other fixes

src/wscript

@@ -308,14 +308,14 @@ def ns3_python_bindings(bld):
                 #mod = mod.split("--lib")[0]
                 pymod.env.append_value('LINKFLAGS', '-l' + mod)
             pymod.env.append_value('LINKFLAGS', '-Wl,-Bdynamic,--no-whole-archive')
-    defines = list(pymod.env['CXXDEFINES'])
+    defines = list(pymod.env['DEFINES'])
     defines.extend(['NS_DEPRECATED=', 'NS3_DEPRECATED_H'])
     if Options.platform == 'win32':
         try:
             defines.remove('_DEBUG') # causes undefined symbols on win32
         except ValueError:
             pass
-    pymod.env['CXXDEFINES'] = defines
+    pymod.env['DEFINES'] = defines
     pymod.includes = '# bindings'
     pymod.install_path = '${PYTHONDIR}/ns'
     return pymod