commit fb2adee9688acc89d5711c83cc6acde0ca1f2ef7
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Mar 30 10:56:55 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Mar 31 22:55:49 2015 -0700
tree c28ce5c613e3c2a90fdca1617fefc9152193b527
parent a0497d8f5cf0f22c7c895332e305d5c982ef4c68

build: Update waf to version 1.8.8-dev (with custom patches)

https://github.com/cawka/waf/tree/8f714a523d3b8c66f2949aaa8db91d6f7be55e55

This patch also embeds the default configuration for PKG_CONFIG_PATH variable.

Change-Id: Ia297fbc8c39ab77ce911e0a9d96dae605eb4cc6e

wscript

diff --git a/wscript b/wscript
index 271b076..946bb5a 100644
--- a/wscript
+++ b/wscript
@@ -28,6 +28,7 @@
 
 from waflib import Build, Logs, Utils, Task, TaskGen, Configure, Context
 from waflib.Tools import c_preproc
+import os
 
 def options(opt):
     opt.load(['compiler_cxx', 'gnu_dirs'])
@@ -48,6 +49,9 @@
                'default-compiler-flags',
                'doxygen', 'sphinx_build'])
 
+    if 'PKG_CONFIG_PATH' not in os.environ:
+        os.environ['PKG_CONFIG_PATH'] = Utils.subst_vars('${LIBDIR}/pkgconfig', conf.env)
+
     conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'],
                    uselib_store='NDN_CXX', mandatory=True)