pal1000
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: support undocumented PKG_CONFIG_SYSTEM_INCLUDE_PATH and PKG_CONFIG_SYSTEM_LIBRARY_PATH environment variables. (closes #86)

feature/tap-sh
William Pitcock 2016-01-21 11:16:39 -05:00
parent a892af7464
commit 7e6fa325eb
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main.c
View File

@ -65,6 +65,17 @@ error_handler(const char *msg)
return true; return true;
} }
static char *
fallback_getenv(const char *envname, const char *fallback)
{
const char *data = getenv(envname);
if (data == NULL)
data = fallback;
return strdup(data);
}
static bool static bool
fragment_has_system_dir(pkgconf_fragment_t *frag) fragment_has_system_dir(pkgconf_fragment_t *frag)
{ {
@ -77,11 +88,11 @@ fragment_has_system_dir(pkgconf_fragment_t *frag)
{ {
case 'L': case 'L':
check_flags = PKG_KEEP_SYSTEM_LIBS; check_flags = PKG_KEEP_SYSTEM_LIBS;
check_paths = strdup(SYSTEM_LIBDIR); check_paths = fallback_getenv("PKG_CONFIG_SYSTEM_LIBRARY_PATH", SYSTEM_LIBDIR);
break; break;
case 'I': case 'I':
check_flags = PKG_KEEP_SYSTEM_CFLAGS; check_flags = PKG_KEEP_SYSTEM_CFLAGS;
check_paths = strdup(SYSTEM_INCLUDEDIR); check_paths = fallback_getenv("PKG_CONFIG_SYSTEM_INCLUDE_PATH", SYSTEM_INCLUDEDIR);
break; break;
default: default:
return false; return false;