[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  2cf141e waf: backport finding of pkg-config
      from  17a6e57 s4-torture: add more NDR tests for GetCorePrinterDrivers

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2cf141ed45b4f7b7754cb9525d987ff38495d789
Author: Uri Simchoni <uri at samba.org>
Date:   Thu Jan 19 07:46:57 2017 +0200

    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 <zentaro at google.com> for
    pointing that out and proposing the fix.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12529
    
    Signed-off-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Jan 25 04:23:00 CET 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 third_party/waf/wafadmin/Tools/config_c.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/third_party/waf/wafadmin/Tools/config_c.py b/third_party/waf/wafadmin/Tools/config_c.py
index 3ab447c..cdf3b3e 100644
--- 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:


-- 
Samba Shared Repository