Consistently pass through PKG_CONFIG_LIBDIR environment variable

src/common/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
 import sys
 
 SOURCES=['chromeos/dbus/dbus.cc',
          'chromeos/string.cc',
          'chromeos/utility.cc']
 
 env = Environment(
     CPPPATH=[ '.', '../third_party/chrome/files' ],
     CCFLAGS=['-fno-exceptions', '-fPIC'],
 )
 for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'):
   value = os.environ.get(key)
   if value != None:
     env[key] = value
 
 # Fix up the pkg-config path if it is present in the environment.

[tedbo, 2010/01/08 18:03:24]

Please fix up the comment as well. Could be:

# Fix issue with scons not passing pkg-config vars through the environment.

[cjwatson, 2010/01/08 18:57:01]

Done for all files. Thanks.

-if os.environ.has_key('PKG_CONFIG_PATH'):
-  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]
 
 # glib and dbug environment
 env.ParseConfig('pkg-config --cflags --libs dbus-1 glib-2.0 dbus-glib-1')
 env.StaticLibrary('chromeos', SOURCES)
 
 # Unit test
 if ARGUMENTS.get('debug', 0):
   env.Append(
     CCFLAGS = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline'],
     LIBS = ['gcov'],
@@ skipping 11 matching lines @@
     env_test[key] = value
 
 unittest_sources =['chromeos/glib/object_unittest.cc']
 unittest_main = ['testrunner.cc']
 unittest_cmd = env_test.Program('unittests',
                            unittest_sources + unittest_main)
 
 Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') +
                     Split('html app.info'))