[Spice-commits] m4/spice-deps.m4 meson.build

[GitLab Mirror]

 m4/spice-deps.m4 |    4 ++--
 meson.build      |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit c00a152e0001fab545f57e5007acaafa83bfee32
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Wed Apr 29 15:27:20 2020 +0100

    build: Remove dependencies to libgthread
    
    libgthread was needed to call g_thread_init.
    This was removed by this commit:
    
        commit 3e116a6c71b77d04260877778f8553cc4aec2ec5
        Date:   Wed Feb 6 13:32:09 2019 +0000
    
            Obsolete Glib cleanup
    
            We require at least GLib 2.38, remove code and check to
            support earlier versions.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 265b17d..e11fc4e 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -119,7 +119,7 @@ AC_DEFUN([SPICE_CHECK_PIXMAN], [
 # use in the GLIB2_CFLAGS and GLIB2_LIBS variables.
 #------------------
 AC_DEFUN([SPICE_CHECK_GLIB2], [
-    PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.38 gthread-2.0 >= 2.38)
+    PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.38)
     PKG_CHECK_MODULES(GIO2, gio-2.0 >= 2.38)
     GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
 ])
@@ -352,7 +352,7 @@ dnl Get the required GLib2 version
     [GLIB2_MIN_VERSION]=GLIB2_MIN_VERSION
     m4_undefine([GLIB2_MIN_VER])dnl
     m4_undefine([GLIB2_MIN_VERSION])dnl
-    PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= $GLIB2_MIN_VER gio-2.0 >= $GLIB2_MIN_VER gthread-2.0 >= $GLIB2_MIN_VER])
+    PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= $GLIB2_MIN_VER gio-2.0 >= $GLIB2_MIN_VER])
 dnl Configuration variables
     AC_CONFIG_SUBDIRS([$1])dnl
     SPICE_COMMON_CFLAGS='-I${top_srcdir}/$1 -I${top_builddir}/$1 -DG_LOG_DOMAIN=\"Spice\" $(SPICE_PROTOCOL_CFLAGS) $(GLIB2_CFLAGS)'
diff --git a/meson.build b/meson.build
index eb1cf31..185f1a9 100644
--- a/meson.build
+++ b/meson.build
@@ -104,7 +104,6 @@ endif
 
 deps = {'spice-protocol' : '>= @0@'.format(spice_protocol_version),
         'glib-2.0'       : glib_version_info,
-        'gthread-2.0'    : glib_version_info,
         'pixman-1'       : '>= 0.17.7',
         'openssl'        : '>= 1.0.0'}