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.

diff --git a/ChangeLog b/ChangeLog
index 259ead5dae44d86c275ece1b2c7d0a49302f5b06..ec34a571ddf2052900eadb8fa13e04e6f8398460 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/main.c b/main.c
index 11ca830f5cdf140a9f03678c6b3d2761e108cbf6..41e5d5996570a490cfd30fcb470d3d5d98b98fd1 100644 (file)
--- 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
   {