[pango] Read the module cache from libdir as well

[Matthias Clasen <matthiasc src gnome org>]

commit 930dc0e942804b45e0f86a68458e1ba7de0e250c
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Aug 25 12:12:22 2012 -0400

    Read the module cache from libdir as well
    
    This is following identical changes made to gdk-pixbuf loaders
    and GTK+ immodules. We read the module cache file that is generated
    by pango-querymodules from $libdir/pango/1.8.0/modules.cache.
    This helps in situations where /etc needs to be readonly or empty.
    
    The old location, $sysconfdir/pango/pango.modules, still works too.

 pango/modules.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/pango/modules.c b/pango/modules.c
index ef952aa..5875f53 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -533,6 +533,11 @@ read_modules (void)
   dlloaded_modules = g_hash_table_new (g_str_hash, g_str_equal);
 
   if (!file_str)
+    file_str = g_build_filename (pango_get_lib_subdirectory (),
+                                 MODULE_VERSION,
+				 "modules.cache",
+				 NULL);
+  if (!file_str)
     file_str = g_build_filename (pango_get_sysconf_subdirectory (),
 				 "pango.modules",
 				 NULL);