Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the PKG_CONFIG_PATH extension code from the build system. #1106

Merged
merged 1 commit into from Nov 16, 2015
Merged

Remove the PKG_CONFIG_PATH extension code from the build system. #1106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 0 additions & 18 deletions make/utilities.pm
View file
Open in desktop
Expand Up @@ -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`;
Expand Down Expand Up @@ -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`;
Expand Down Expand Up @@ -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`;
Expand Down