Add a work around for trampling over PKG_CONFIG_PATH.

The extend_pkg_path method will be removed in 2.2 as it
causes problems with non-standard pkg-config paths. This
commit adds a workaround until that happens.

diff --git a/make/utilities.pm b/make/utilities.pm
index 8c8ac0d49ca70d32eb33dbcec29401888f112ee7..42dd6b547553b7a3775a51bb5ccf9f813e7b048f 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -95,6 +95,7 @@ sub make_rpath($;$)
 
 sub extend_pkg_path()
 {
+       return if defined $ENV{DISABLE_EXTEND_PKG_PATH};
        if (!exists $ENV{PKG_CONFIG_PATH})
        {
                $ENV{PKG_CONFIG_PATH} = "/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig";