waf: backport finding of pkg-config

Allow the builder to customize the location of pkg-config utility by setting PKGCONFIG environment variable. This is backported from upstream waf. Thanks to Zentaro Kavanagh <[email protected]> for pointing that out and proposing the fix. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12529 Signed-off-by: Uri Simchoni <[email protected]> Reviewed-by: Jeremy Allison <[email protected]> Autobuild-User(master): Jeremy Allison <[email protected]> Autobuild-Date(master): Wed Jan 25 04:23:00 CET 2017 on sn-devel-144
NeuralNoise · Jan 25, 2017 · 2cf141e · 2cf141e
1 parent 17a6e57
commit 2cf141e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/third_party/waf/wafadmin/Tools/config_c.py b/third_party/waf/wafadmin/Tools/config_c.py
@@ -106,7 +106,9 @@ def ret_msg(self, f, kw):
 @conf
 def validate_cfg(self, kw):
 	if not 'path' in kw:
-		kw['path'] = 'pkg-config --errors-to-stdout --print-errors'
+		if not self.env.PKGCONFIG:
+			self.find_program('pkg-config', var='PKGCONFIG')
+		kw['path'] = self.env.PKGCONFIG
 
 	# pkg-config version
 	if 'atleast_pkgconfig_version' in kw: