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

[GitLab Mirror]

 m4/spice-deps.m4 |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit b2f919f109a00b1921e8397be488047df126c2b7
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Tue Mar 3 12:24:47 2020 +0000

    Add missing dependency in Autoconf integration
    
    spice-common depends on Glib2, so automatically add to the
    dependency list.
    You can define a GLIB2_MIN_VER m4 variable in configure.ac
    to raise the default GLib2 required version.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Kevin Pouget <kpouget at redhat.com>

diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 9e1b8fd..ebe8893 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -355,6 +355,9 @@ AC_DEFUN([SPICE_CHECK_INSTRUMENTATION], [
 #
 # SPICE_PROTOCOL_MIN_VER  input (m4) and output (autoconf) SPICE protocol version
 # SPICE_PROTOCOL_CFLAGS   CFLAGS for SPICE protocol, already automatically included
+#
+# GLIB2_MIN_VER           input (m4) and output (shell) GLib2 minimum version
+# GLIB2_MIN_VERSION       output (shell) variable like "GLIB_VERSION_1_2" from GLIB2_MIN_VER
 #------------------
 AC_DEFUN([SPICE_COMMON], [dnl
 dnl These add some flags and checks to component using spice-common
@@ -369,9 +372,18 @@ dnl Get the required spice protocol version
     m4_undefine([SPICE_PROTOCOL_MIN_VER])dnl
     PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= $SPICE_PROTOCOL_MIN_VER])
     AC_SUBST([SPICE_PROTOCOL_MIN_VER])dnl
+dnl Get the required GLib2 version
+    m4_define([GLIB2_MIN_VER],m4_ifdef([GLIB2_MIN_VER],GLIB2_MIN_VER,[2.38]))dnl
+    m4_define([GLIB2_MIN_VER],m4_if(m4_version_compare(GLIB2_MIN_VER,[2.38]),[1],GLIB2_MIN_VER,[2.38]))dnl
+    m4_define([GLIB2_MIN_VERSION],[GLIB_VERSION_]m4_translit(GLIB2_MIN_VER,[.],[_]))dnl
+    [GLIB2_MIN_VER]=GLIB2_MIN_VER
+    [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])
 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)'
+    SPICE_COMMON_CFLAGS='-I${top_srcdir}/$1 -I${top_builddir}/$1 -DG_LOG_DOMAIN=\"Spice\" $(SPICE_PROTOCOL_CFLAGS) $(GLIB2_CFLAGS)'
     AC_SUBST([SPICE_COMMON_CFLAGS])dnl
 
     SPICE_COMMON_DIR='${top_builddir}/$1'