diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-08 16:41:27 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-08 16:41:27 +0100 |
| commit | 03346747e21e4cd1db30c6a5d8af6705575e3755 (patch) | |
| tree | 120604af21bdac64007a0a3005dcce420cb76714 /mesalib/scons/custom.py | |
| parent | ada3d2c30b5a7a1a79e128b7326d50c3bab77a8a (diff) | |
| download | vcxsrv-03346747e21e4cd1db30c6a5d8af6705575e3755.tar.gz vcxsrv-03346747e21e4cd1db30c6a5d8af6705575e3755.tar.bz2 vcxsrv-03346747e21e4cd1db30c6a5d8af6705575e3755.zip | |
mesa git update 8 feb 2012
Diffstat (limited to 'mesalib/scons/custom.py')
| -rw-r--r-- | mesalib/scons/custom.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py index 08073162e..cc953bd99 100644 --- a/mesalib/scons/custom.py +++ b/mesalib/scons/custom.py @@ -174,6 +174,9 @@ def _pkg_check_modules(env, name, modules): if subprocess.call(["pkg-config", "--exists", ' '.join(modules)]) != 0: return + # Strip version expressions from modules + modules = [module.split(' ', 1)[0] for module in modules] + # Other flags may affect the compilation of unrelated targets, so store # them with a prefix, (e.g., XXX_CFLAGS, XXX_LIBS, etc) try: @@ -189,7 +192,7 @@ def _pkg_check_modules(env, name, modules): def pkg_check_modules(env, name, modules): - sys.stdout.write('Checking for %s...' % name) + sys.stdout.write('Checking for %s (%s)...' % (name, ' '.join(modules))) _pkg_check_modules(env, name, modules) result = env['HAVE_' + name] sys.stdout.write(' %s\n' % ['no', 'yes'][int(bool(result))]) |