summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-01-13 16:49:55 +0300
committerStefano Karapetsas <[email protected]>2015-01-14 07:50:21 +0100
commit822fbf5f111b83f3cb277377557dcf6ff3547620 (patch)
tree42785661372e333ea2154e7d0422400044a45282
parentf016c9acb9f1a4393d8863b5ce3f8630f7263183 (diff)
downloadmate-polkit-822fbf5f111b83f3cb277377557dcf6ff3547620.tar.bz2
mate-polkit-822fbf5f111b83f3cb277377557dcf6ff3547620.tar.xz
require GLib >= 2.36 and don't use g_type_init
Closes https://github.com/mate-desktop/mate-polkit/pull/18
-rw-r--r--configure.ac9
-rw-r--r--src/main.c3
2 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 68b89a9..03fe6e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,10 @@ MATE_MAINTAINER_MODE_DEFINES
# Check for required packages
# ***************************
+GLIB_REQUIRED=2.36.0
+POLKIT_AGENT_REQUIRED=0.97
+POLKIT_GOBJECT_REQUIRED=0.97
+
AC_MSG_CHECKING([which gtk+ version to compile against])
AC_ARG_WITH([gtk],
[AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
@@ -141,13 +145,12 @@ case "$with_gtk" in
esac
AC_SUBST(GTK_API_VERSION)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+
PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-POLKIT_AGENT_REQUIRED=0.97
-POLKIT_GOBJECT_REQUIRED=0.97
-
PKG_CHECK_MODULES(POLKIT_AGENT, polkit-agent-1 >= $POLKIT_AGENT_REQUIRED)
AC_SUBST(POLKIT_AGENT_CFLAGS)
AC_SUBST(POLKIT_AGENT_LIBS)
diff --git a/src/main.c b/src/main.c
index 86b55f3..a03d7e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -206,9 +206,6 @@ main (int argc, char **argv)
PolkitAgentListener *listener;
GError *error;
-#if !GLIB_CHECK_VERSION (2, 36, 0)
- g_type_init ();
-#endif
gtk_init (&argc, &argv);
loop = NULL;