2005-04-22 Tollef Fog Heen <tfheen@err.no>

Author: tfheen
Date: 2005-04-22 00:19:24 GMT
2005-04-22  Tollef Fog Heen  <tfheen@err.no>

    * main.c (main): Re-add PKG_CONFIG_LIBDIR support which was
    removed by mistake.
This commit is contained in:
Arch Librarian 2005-07-14 13:07:11 +00:00
parent c2a44053c3
commit c22e6a1838
2 changed files with 17 additions and 5 deletions

View file

@ -1,3 +1,8 @@
2005-04-22 Tollef Fog Heen <tfheen@err.no>
* main.c (main): Re-add PKG_CONFIG_LIBDIR support which was
removed by mistake.
2005-04-14 Tollef Fog Heen <tfheen@err.no>
* configure.in: Bump to 0.17.2

17
main.c
View file

@ -278,13 +278,20 @@ main (int argc, char **argv)
debug_spew ("PKG_CONFIG_DEBUG_SPEW variable enabling debug spew\n");
}
search_path = getenv ("PKG_CONFIG_PATH");
if (search_path)
if (getenv("PKG_CONFIG_LIBDIR") != NULL)
{
add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S);
add_search_dirs(getenv("PKG_CONFIG_LIBDIR"), G_SEARCHPATH_SEPARATOR_S);
}
else
{
search_path = getenv ("PKG_CONFIG_PATH");
if (search_path)
{
add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S);
}
add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S);
}
add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S);
#ifdef G_OS_WIN32
{