X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcinit.c;h=693e0b7b3362eadb712c64a1fe6a065ec6576d55;hb=64d7e303df441f274ee194a401dcd14dfb58af7e;hp=f64c0f0dcb1f5e03ad1d25b4e65060c995097ff3;hpb=8fe2104a1e5771ac8079a438fa21e00f946be8b3;p=fontconfig.git

diff --git a/src/fcinit.c b/src/fcinit.c
index f64c0f0..693e0b7 100644
--- a/src/fcinit.c
+++ b/src/fcinit.c
@@ -69,6 +69,25 @@ FcInitLoadConfig (void)
 	FcConfigDestroy (config);
 	return FcInitFallbackConfig ();
     }
+    
+    if (config->cacheDirs && config->cacheDirs->num == 0)
+    {
+	fprintf (stderr,
+		 "Fontconfig warning: no <cachedir> elements found. Check configuration.\n");
+	fprintf (stderr,
+		 "Fontconfig warning: adding <cachedir>%s</cachedir>\n",
+		 FC_CACHEDIR);
+	fprintf (stderr,
+		 "Fontconfig warning: adding <cachedir>~/.fontconfig</cachedir>\n");
+	if (!FcConfigAddCacheDir (config, (FcChar8 *) FC_CACHEDIR) ||
+	    !FcConfigAddCacheDir (config, (FcChar8 *) "~/.fontconfig"))
+	{
+	    fprintf (stderr,
+		     "Fontconfig error: out of memory");
+	    FcConfigDestroy (config);
+	    return FcInitFallbackConfig ();
+	}
+    }
 
     return config;
 }
@@ -263,3 +282,6 @@ FcMemFree (int kind, int size)
 	    FcMemReport ();
     }
 }
+#define __fcinit__
+#include "fcaliastail.h"
+#undef __fcinit__