Bug 164001 - pango-querymodules doesn't work uninstalled on win32

2009-01-06  Tor Lillqvist  <tml@iki.fi>

	Bug 164001 - pango-querymodules doesn't work uninstalled on win32

	* pango/pango-utils.c (pango_get_lib_subdirectory): When running
	against an uninstalled, compile-time DLL, in the libtool-style
	.libs folder, use the compile-time install prefix.

svn path=/trunk/; revision=2783

diff --git a/ChangeLog b/ChangeLog
index 1591a1d..59dc380 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-06  Tor Lillqvist  <tml@iki.fi>
+
+       Bug 164001 - pango-querymodules doesn't work uninstalled on win32
+
+       * pango/pango-utils.c (pango_get_lib_subdirectory): When running
+       against an uninstalled, compile-time DLL, in the libtool-style
+       .libs folder, use the compile-time install prefix.
+
 2009-01-03  Behdad Esfahbod  <behdad@gnome.org>
 
        Bug 384362 – pango can't select some font styles

diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 78e969f..72a84fa 100644 (file)
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -727,7 +727,13 @@ pango_get_lib_subdirectory (void)
   if (result == NULL)
     {
       gchar *root = g_win32_get_package_installation_directory_of_module (pango_dll);
-      result = g_build_filename (root, "lib\\pango", NULL);
+      /* If we are running against an uninstalled copy of the Pango DLL,
+       * use the compile-time installation prefix.
+       */
+      if (g_str_has_suffix (root, "\\.libs"))
+       result = g_strdup (LIBDIR "/pango");
+      else
+       result = g_build_filename (root, "lib\\pango", NULL);
       g_free (root);
     }
   return result;