From 846e57b6fd11e30af5cbee054cadd369566da6fd Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 5 May 2021 15:39:00 +0300 Subject: [PATCH 45/47] Do not enable gtk3x-client for --enable-client=all It doesn't compile with the final gtk4 stable yet. See osdn #42180 Signed-off-by: Marko Lindqvist --- m4/gtk3x-client.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/gtk3x-client.m4 b/m4/gtk3x-client.m4 index bf9fecb5b6..4d6cd7de6b 100644 --- a/m4/gtk3x-client.m4 +++ b/m4/gtk3x-client.m4 @@ -5,9 +5,9 @@ AC_DEFUN([FC_GTK3X_CLIENT], [ - # Add check "x$client" = "xauto" when this becomes supported client - if test "x$gui_gtk3x" = "xyes" || - test "x$client" = "xall" ; then + # Add checks "x$client" = "xauto" and "x$client" = "xall" + # when this becomes supported client + if test "x$gui_gtk3x" = "xyes" ; then PKG_CHECK_MODULES([GTK3X], [gtk4 >= 3.96.0], [ GTK3X_CFLAGS="$GTK3X_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_94" -- 2.30.2