From c22e6a18381f0f05f9149f25829f49a12667057a Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Thu, 14 Jul 2005 13:07:11 +0000 Subject: [PATCH] 2005-04-22 Tollef Fog Heen Author: tfheen Date: 2005-04-22 00:19:24 GMT 2005-04-22 Tollef Fog Heen * main.c (main): Re-add PKG_CONFIG_LIBDIR support which was removed by mistake. --- ChangeLog | 5 +++++ main.c | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 259ead5..ec34a57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-04-22 Tollef Fog Heen + + * main.c (main): Re-add PKG_CONFIG_LIBDIR support which was + removed by mistake. + 2005-04-14 Tollef Fog Heen * configure.in: Bump to 0.17.2 diff --git a/main.c b/main.c index 11ca830..41e5d59 100644 --- a/main.c +++ b/main.c @@ -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 { -- 2.39.5