[network-manager-vpnc/danw/deps: 1/2] build: require GLib 2.32

[Dan Winship <danw src gnome org>]

commit bd4b54fcd8be2cb68fb8dfa7014e5d0471a3d29d
Author: Dan Winship <danw gnome org>
Date:   Tue Feb 26 11:16:16 2013 +0100

    build: require GLib 2.32

 auth-dialog/Makefile.am |    2 +-
 auth-dialog/main.c      |    4 ----
 configure.ac            |    7 ++++---
 properties/Makefile.am  |    1 +
 src/Makefile.am         |    4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 896da14..2a7cfee 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -4,7 +4,7 @@ libexec_PROGRAMS = nm-vpnc-auth-dialog
 
 nm_vpnc_auth_dialog_CPPFLAGS = \
        $(NM_CFLAGS) \
-       $(GTHREAD_CFLAGS) \
+       $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GNOMEKEYRING_CFLAGS) \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index fa34039..5c9428b 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -101,10 +101,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_uuid,
              const char *vpn_name,
diff --git a/configure.ac b/configure.ac
index 76f3faf..3469522 100644
--- 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 4994efc..4103be0 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -15,6 +15,7 @@ uidir = $(datadir)/gnome-vpn-properties/vpnc
 ui_DATA = nm-vpnc-dialog.ui
 
 libnm_vpnc_properties_la_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GNOMEKEYRING_CFLAGS) \
        $(NM_CFLAGS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index 0dd2b9b..3e458d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I${top_srcdir}
 
 AM_CPPFLAGS = \
        $(DBUS_CFLAGS) \
-       $(GTHREAD_CFLAGS) \
+       $(GLIB_CFLAGS) \
        $(NM_CFLAGS) \
        -DG_DISABLE_DEPRECATED \
        -DBINDIR=\"$(bindir)\" \
@@ -24,7 +24,7 @@ nm_vpnc_service_SOURCES = \
 
 nm_vpnc_service_LDADD = \
        $(DBUS_LIBS) \
-       $(GTHREAD_LIBS) \
+       $(GLIB_LIBS) \
        $(NM_LIBS)