summaryrefslogtreecommitdiff
path: root/pango/modules.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2012-12-18 13:59:33 -0500
committerBehdad Esfahbod <behdad@behdad.org>2012-12-18 13:59:33 -0500
commit2df1807564ba146a207b8e4087f18161e7beaa0a (patch)
treeb4bf64972871055de77fbc234798261430e55bf4 /pango/modules.c
parent28cbfde6a0829283c22ab586907096ae2ad72dc0 (diff)
downloadpango-2df1807564ba146a207b8e4087f18161e7beaa0a.tar.gz
Bug 690279 - broken relocation of modules
Fix OS X relocation.
Diffstat (limited to 'pango/modules.c')
-rw-r--r--pango/modules.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/pango/modules.c b/pango/modules.c
index c5a19f25..24cdbf7d 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -450,7 +450,13 @@ process_module_file (FILE *module_file, const gchar *module_file_dir)
switch (i)
{
case 0:
- if (!g_path_is_absolute (tmp_buf->str))
+ if (!g_path_is_absolute (tmp_buf->str)
+#ifdef __APPLE__
+ && strncmp (tmp_buf->str, "@executable_path/", 17)
+ && strncmp (tmp_buf->str, "@loader_path/", 13)
+ && strncmp (tmp_buf->str, "@rpath/", 7)
+#endif
+ )
{
const gchar *lib_dir = pango_get_lib_subdirectory ();
const gchar *abs_file_name = g_build_filename (lib_dir,