2006-08-16 Tollef Fog Heen <tfheen@err.no>

	* main.c (main): Always add the elements from PKG_CONFIG_PATH.
	Freedesktop #4795.

diff --git a/ChangeLog b/ChangeLog
index 1e7c77c9ba0e50d0b6ad0fd19f0c83028503c0bb..92fee0f75b29d4ab1d016922023cc66a84dd4d17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-16  Tollef Fog Heen  <tfheen@err.no>
 
+       * main.c (main): Always add the elements from PKG_CONFIG_PATH.
+       Freedesktop #4795.
+
        * pkg-config.1: Apply patch from Ed Catmur to document
        PKG_PROG_PKG_CONFIG and that it should be used if the first call
        to PKG_CHECK_MODULES might not happen.

diff --git a/main.c b/main.c
index d0df377dbed0862b006de2a10fe2aeb5053cae5d..68c3d422a13438d96b9cb068d5d6f758d38d459b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -281,18 +281,17 @@ 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) 
+    {
+      add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S);
+    }
   if (getenv("PKG_CONFIG_LIBDIR") != NULL) 
     {
       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);
     }