Call is deprecated
Signed-off-by: Peter Hutterer <[email protected]>
---
configure.ac | 5 +++++
libwacom/libwacom.c | 2 ++
2 files changed, 7 insertions(+)
diff --git a/configure.ac b/configure.ac
index 4d49912..2651aec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,11 @@ AM_CONDITIONAL(HAVE_LIBXML, test x$HAVE_LIBXML = xyes)
PKG_CHECK_MODULES(GTK2, librsvg-2.0 glib-2.0 gtk+-2.0, HAVE_GTK2="yes",
HAVE_GTK2="no")
AM_CONDITIONAL(HAVE_GTK2, test x$HAVE_GTK2 = xyes)
+PKG_CHECK_MODULES(GLIB_236, [glib-2.0 >= 2.36], HAVE_GLIB236="yes",
HAVE_GLIB236="no")
+if test "x$HAVE_GLIB236" != "xyes"; then
+ AC_DEFINE(NEED_G_TYPE_INIT, 1, [Need g_type_init() call])
+fi
+
AC_CONFIG_FILES([Makefile
data/Makefile
data/layouts/Makefile
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
index d912f25..99716be 100644
--- a/libwacom/libwacom.c
+++ b/libwacom/libwacom.c
@@ -201,7 +201,9 @@ get_device_info (const char *path,
char *bus_str;
const char *devname;
+#if NEED_G_TYPE_INIT
g_type_init();
+#endif
retval = FALSE;
/* The integration flags from device info are unset by default */
--
2.4.1
------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
