=== modified file 'wscript' --- wscript 2013-06-03 19:37:36 +0000 +++ wscript 2013-06-07 12:03:57 +0000 @@ -138,6 +138,10 @@ Task.simple_task_type ('winrc', '${WINRC if is_mingw (conf.env) and Options.platform != 'win32': if not 'AR' in os.environ and not 'RANLIB' in os.environ: conf.env['AR'] = os.environ['CC'][:-3] + 'ar' + if not 'PKG_CONFIG' in os.environ: + conf.env['PKG_CONFIG'] = os.environ['CC'][:-3] + 'pkg-config' + else: + conf.env['PKG_CONFIG'] = os.environ['PKG_CONFIG'] if conf.find_program (os.environ['CC'][:-3] + 'windres', var='WINRC'): os.environ['WINRC'] = os.environ['CC'][:-3] + 'windres' Options.platform = 'win32' @@ -184,12 +188,12 @@ Task.simple_task_type ('winrc', '${WINRC var = name.split ('-')[0].upper () ver_str = ['',' >= ' + version][version != ''] def okmsg_ver (kw): - return conf.check_cfg (modversion=name, uselibstore=var) - conf.check_cfg (msg='Checking for ' + name + ver_str, okmsg=okmsg_ver, + return conf.check_cfg (path=conf.env['PKG_CONFIG'], modversion=name, uselibstore=var) + conf.check_cfg (path=conf.env['PKG_CONFIG'], msg='Checking for ' + name + ver_str, okmsg=okmsg_ver, package=name, uselib_store=var, args='--cflags --libs ' + args, atleast_version=version, mandatory=mandatory) have = conf.env['HAVE_' + var] == 1 - conf.define (var + '_VERSION', ['No', conf.check_cfg (modversion=name, + conf.define (var + '_VERSION', ['No', conf.check_cfg (path=conf.env['PKG_CONFIG'], modversion=name, uselib_store=var, errmsg=name + ver_str + ' not found')][have]) return have