build: require GLib 2.32

diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index c1ad8f3..a10ff34 100644 (file)
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,7 +1,7 @@
 libexec_PROGRAMS = nm-openvpn-auth-dialog
 
 nm_openvpn_auth_dialog_CPPFLAGS =                      \
-       $(GTHREAD_CFLAGS)                       \
+       $(GLIB_CFLAGS)                  \
        $(GTK_CFLAGS)                           \
        $(NM_CFLAGS)            \
        $(GNOMEKEYRING_CFLAGS) \

diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 5e06cee..d0fa110 100644 (file)
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -103,10 +103,6 @@ keyfile_print_stdout (GKeyFile *keyfile)
        g_free (data);
 }
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-#define g_key_file_unref g_key_file_free
-#endif
-
 static gboolean
 get_secrets (const char *vpn_name,
              const char *vpn_uuid,

diff --git a/configure.ac b/configure.ac
index bd566e7..211c716 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,9 +57,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 IT_PROG_INTLTOOL([0.35])
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 
 PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
 AC_SUBST(DBUS_CFLAGS)

diff --git a/properties/Makefile.am b/properties/Makefile.am
index d1caf79..69c3fbb 100644 (file)
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -15,6 +15,7 @@ uidir = $(datadir)/gnome-vpn-properties/openvpn
 ui_DATA = nm-openvpn-dialog.ui
 
 libnm_openvpn_properties_la_CFLAGS =                    \
+        $(GLIB_CFLAGS)                                  \
         $(GTK_CFLAGS)                                   \
         $(NM_CFLAGS)                       \
         $(GNOMEKEYRING_CFLAGS)                          \

diff --git a/src/Makefile.am b/src/Makefile.am
index 15a39a4..e5a0b7e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
        $(DBUS_CFLAGS) \
        $(NM_CFLAGS) \
        -DG_DISABLE_DEPRECATED \