Consistently pass through PKG_CONFIG_LIBDIR environment variable

src/platform/window_manager/SConstruct

 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 Help('''\
 Type: 'scons' to build and 'scons -c' to clean\
 ''')
 
@@ skipping 37 matching lines @@
 base_env = Environment()
 for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'):
   value = os.environ.get(key)
   if value != None:
     base_env[key] = value
 if not base_env.get('CCFLAGS'):
   base_env['CCFLAGS'] = '-I.. -Wall -Werror -O3'
 base_env['LINKFLAGS'] = '-lgflags -lprotobuf'
 
 # Fix up the pkg-config path if it is present in the environment.
-if os.environ.has_key('PKG_CONFIG_PATH'):
-  base_env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
+for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH'):
+  if os.environ.has_key(key):
+    env['ENV'][key] = os.environ[key]
 
 # Unless we disable strict aliasing, we get warnings about some of the
 # program's command line flags processing code that look like:
 #   'dereferencing type-punned pointer will break strict-aliasing rules'
 base_env.Append(CCFLAGS=' -fno-strict-aliasing')
 
 # We include files relative to the parent directory.  Let SCons know about
 # this so it'll recompile as needed when a header changes.
 base_env['CPPPATH'] = ['..',
                        '../../third_party/chrome/files',
@@ skipping 96 matching lines @@
 test_env.Program('shadow_test', 'shadow_test.cc')
 test_env.Program('stacking_manager_test', 'stacking_manager_test.cc')
 test_env.Program('util_test', 'util_test.cc')
 test_env.Program('window_manager_test', 'window_manager_test.cc')
 test_env.Program('window_test', 'window_test.cc')
 test_env.Program('x_connection_test', 'x_connection_test.cc')
 
 mock_chrome_env = wm_env.Clone()
 mock_chrome_env.ParseConfig('pkg-config --cflags --libs gtkmm-2.4')
 mock_chrome_env.Program('mock_chrome', 'mock_chrome.cc')