--- a/wscript	Sat Nov 20 17:51:17 2010 +0000
+++ b/wscript	Sat Nov 20 17:55:53 2010 +0000
@@ -7,6 +7,7 @@
 import optparse
 import os.path
 import re
+import shlex
 
 # WAF modules
 import pproc as subprocess
@@ -385,7 +386,8 @@
                               ['LINKFLAGS', 'LINKFLAGS_EXTRA'],
                               ['LINKFLAGS', 'LDFLAGS_EXTRA']]:
         if envvar in os.environ:
-            conf.env.append_value(confvar, os.environ[envvar])
+            value = shlex.split(os.environ[envvar])
+            conf.env.append_value(confvar, value)
 
     # Write a summary of optional features status
     print "---- Summary of optional NS-3 features:"