Skip to content

A number of fixes + win32 compat#1

Merged
kaniini merged 7 commits intopkgconf:masterfrom
mgorny:master
May 2, 2012
Merged

A number of fixes + win32 compat#1
kaniini merged 7 commits intopkgconf:masterfrom
mgorny:master

Conversation

@mgorny
Copy link
Contributor

@mgorny mgorny commented May 2, 2012

Simplifying code and making it more compatible with pkg-config.

mgorny added 5 commits May 2, 2012 11:24
This is what pkg-config does, and it is necessary because ':' is part of
path specification on win32.
Instead of repeating the parsing stage after reaching the null
terminator, just handle it inside the loop and terminate the loop
afterwards.
We always replace that current pos with a null terminator, so it doesn't
matter what follows it.
This avoids looking for '/foo.pc'.
@mgorny
Copy link
Contributor Author

mgorny commented May 2, 2012

And also a few fixes and path lookup optimizations.

mgorny added 2 commits May 2, 2012 16:02
That condition is now handled within pkg_find() completely.
PKG_CONFIG_PATH paths must take precedence over the default path.
Otherwise, we would be unable to override default .pc files.

And while I'm at it, simplify the whole code. It is pointless to
introduce another buffer and a lot of string mangling for one additional
path.
kaniini added a commit that referenced this pull request May 2, 2012
A number of fixes + win32 compat
@kaniini kaniini merged commit 281d69e into pkgconf:master May 2, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants