From eb92b512c6bc18d370264712985710a640edf795 Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@intel.com>
Date: Sat, 15 Sep 2012 14:39:29 +0100
Subject: [PATCH] core: Don't initialize the GType system with --disable-glib

--disable-glib also defines COGL_HAS_GTYPE_SUPPORT to #ifdef out GType
support in cogl. This also means we don't want to initialize glib's type
system in that case.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 67ad777099d62bdbc8515f6ee58ed80429cc6496)
---
 cogl/cogl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cogl/cogl.c b/cogl/cogl.c
index 5fd63fc93..eda6efa58 100644
--- a/cogl/cogl.c
+++ b/cogl/cogl.c
@@ -800,7 +800,9 @@ _cogl_init (void)
       bindtextdomain (GETTEXT_PACKAGE, COGL_LOCALEDIR);
       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
+#ifdef COGL_HAS_GTYPE_SUPPORT
       g_type_init ();
+#endif
 
       _cogl_config_read ();
       _cogl_debug_check_environment ();