jhbuild r2548 - in trunk: . jhbuild

[fpeters svn gnome org]

Author: fpeters
Date: Fri Nov 28 23:01:34 2008
New Revision: 2548
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2548&view=rev

Log:
* jhbuild/config.py: add system pkgconfig lookup-directories by
default. It is possible to avoid this by setting PKG_CONFIG_PATH
to the empty string.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/config.py

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Fri Nov 28 23:01:34 2008
@@ -197,6 +197,14 @@
         addpath('MANPATH', manpathdir)
 
         # PKG_CONFIG_PATH
+        if os.environ.get('PKG_CONFIG_PATH') is None:
+            # add system pkgconfig lookup-directories by default, as pkg-config
+            # usage spread and is now used by libraries that are out of jhbuild
+            # realm; this also helps when building a single module with
+            # jhbuild.  It is possible to avoid this by setting PKG_CONFIG_PATH
+            # to the empty string.
+            addpath('PKG_CONFIG_PATH', '/usr/share/pkgconfig')
+            addpath('PKG_CONFIG_PATH', '/usr/lib/pkgconfig')
         pkgconfigdatadir = os.path.join(self.prefix, 'share', 'pkgconfig')
         pkgconfigdir = os.path.join(libdir, 'pkgconfig')
         addpath('PKG_CONFIG_PATH', pkgconfigdatadir)