[network-manager-openswan] build: require GLib 2.32

[Dan Winship <danw src gnome org>]

commit 12d6e3f8c755d7d61801664f1137f064e62acb03
Author: Dan Winship <danw gnome org>
Date:   Tue Feb 26 10:54:26 2013 +0100

    build: require GLib 2.32

 auth-dialog/Makefile.am |    1 +
 auth-dialog/main.c      |    4 ----
 configure.ac            |    7 ++++---
 properties/Makefile.am  |    1 +
 src/Makefile.am         |    4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 4b5a01d..b2296d1 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -3,6 +3,7 @@ INCLUDES = -I${top_srcdir}
 libexec_PROGRAMS = nm-openswan-auth-dialog
 
 nm_openswan_auth_dialog_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
        $(NM_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GNOMEKEYRING_CFLAGS) \
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index f96ab6e..eebb522 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 9164793..d150393 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 1fe3724..fbad405 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -11,6 +11,7 @@ uidir = $(datadir)/gnome-vpn-properties/openswan
 ui_DATA = nm-openswan-dialog.ui
 
 libnm_openswan_properties_la_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(NM_CFLAGS) \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
diff --git a/src/Makefile.am b/src/Makefile.am
index 12ce851..c417888 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_openswan_service_SOURCES = \
 
 nm_openswan_service_LDADD = \
                                $(DBUS_LIBS) \
-                               $(GTHREAD_LIBS) \
+                               $(GLIB_LIBS) \
                                $(NM_LIBS)