diff options
author | Peter Powell <petpow@saberuk.com> | 2015-11-12 00:21:31 +0000 |
---|---|---|
committer | Peter Powell <petpow@saberuk.com> | 2015-11-12 00:21:31 +0000 |
commit | 6bf55c1b052c92183b2a7df659023fd73910211d (patch) | |
tree | 0a823cecd9d4a617e02a3d8a49abc6390499d940 | |
parent | 009cc921802a917f8680a3c6e5294a303438c2fd (diff) |
Remove the PKG_CONFIG_PATH extension code from the build system.
-rw-r--r-- | make/utilities.pm | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/make/utilities.pm b/make/utilities.pm index dc286da5e..565ac5fff 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -90,24 +90,10 @@ sub make_rpath($;$) return $output; } -sub 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"; - } - else - { - $ENV{PKG_CONFIG_PATH} .= ":/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig"; - } -} - sub pkgconfig_get_include_dirs($$$;$) { my ($packagename, $headername, $defaults, $module) = @_; - extend_pkg_path(); - print "Locating include directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; my $v = `pkg-config --modversion $packagename 2>/dev/null`; @@ -180,8 +166,6 @@ sub pkgconfig_check_version($$;$) { my ($packagename, $version, $module) = @_; - extend_pkg_path(); - print "Checking version of package \e[1;32m$packagename\e[0m is >= \e[1;32m$version\e[0m... "; my $v = `pkg-config --modversion $packagename 2>/dev/null`; @@ -213,8 +197,6 @@ sub pkgconfig_get_lib_dirs($$$;$) { my ($packagename, $libname, $defaults, $module) = @_; - extend_pkg_path(); - print "Locating library directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; my $v = `pkg-config --modversion $packagename 2>/dev/null`; |