Add glib 2.38 support

diff --git a/configure.ac b/configure.ac
index bdd82d4604d18f7b483a8e6525989c5390631cff..a5a7fd3e9dcaf44413b75011f919cb3543a02123 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -271,7 +271,7 @@ fi
 dnl Don't do anything too subtle here, because the CMake build system
 dnl parses these lines with regular expressions. If necessary, adjust
 dnl cmake/modules/MacrosAutotools.cmake to compensate.
-AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_40], [Ignore post-2.40 deprecations])
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_38], [Ignore post-2.38 deprecations])
 AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [G_ENCODE_VERSION(2,44)], [Prevent post-2.44 APIs])
 
 with_glib=yes

diff --git a/test/test-utils-glib.h b/test/test-utils-glib.h
index 93b52b74ffd3cde58da2a51639be2816af7813c7..ce8171bd19cde508d1f53aae1a7304851f8319f3 100644 (file)
--- a/test/test-utils-glib.h
+++ b/test/test-utils-glib.h
@@ -121,6 +121,10 @@ backported_g_steal_pointer (gpointer pointer_to_pointer)
 }
 #endif
 
+#ifndef g_assert_nonnull
+#define g_assert_nonnull(a) g_assert (a != NULL)
+#endif
+
 gboolean test_check_tcp_works (void);
 
 void test_store_result_cb (GObject *source_object,