From 8bd3b2c80118d582dec4c1d74a755944d64f4628 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Wed, 20 May 2020 16:34:19 -0400
Subject: [PATCH] configure: fix fcitx tests.

Otherwise Unix systems without D-Bus support will attempt to compile sources
they can't handle.
---
 configure    | 10 ++++++++--
 configure.ac |  8 ++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 6a8b84c79c698..f1c2e04b022dc 100755
--- a/configure
+++ b/configure
@@ -23083,18 +23083,24 @@ else
 fi
 
     if test x$enable_fcitx = xyes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fcitx support" >&5
+$as_echo_n "checking for fcitx support... " >&6; }
+        have_fcitx=no
         if test x$enable_ime != xyes; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IME support is required for fcitx." >&5
 $as_echo "$as_me: WARNING: IME support is required for fcitx." >&2;}
-        elif test x$enable_dbus != xyes; then
+        elif test x$have_dbus_dbus_h_hdr != xyes; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: DBus support is required for fcitx." >&5
 $as_echo "$as_me: WARNING: DBus support is required for fcitx." >&2;}
         else
+            have_fcitx=yes
 
 $as_echo "#define HAVE_FCITX 1" >>confdefs.h
 
             SOURCES="$SOURCES $srcdir/src/core/linux/SDL_fcitx.c"
         fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_fcitx" >&5
+$as_echo "$have_fcitx" >&6; }
     fi
 }
 
@@ -25775,7 +25781,7 @@ if test x$have_ibus_ibus_h_hdr = xyes; then
 else
     SUMMARY="${SUMMARY}Using ibus          : NO\n"
 fi
-if test x$enable_fcitx = xyes; then
+if test x$have_fcitx = xyes; then
     SUMMARY="${SUMMARY}Using fcitx         : YES\n"
 else
     SUMMARY="${SUMMARY}Using fcitx         : NO\n"
diff --git a/configure.ac b/configure.ac
index 19db7755f2be3..36e7086c9cdb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2741,14 +2741,18 @@ CheckFcitx()
 AS_HELP_STRING([--enable-fcitx], [enable fcitx support [[default=yes]]]),
                   , enable_fcitx=yes)
     if test x$enable_fcitx = xyes; then
+        AC_MSG_CHECKING(for fcitx support)
+        have_fcitx=no
         if test x$enable_ime != xyes; then
             AC_MSG_WARN([IME support is required for fcitx.])
-        elif test x$enable_dbus != xyes; then
+        elif test x$have_dbus_dbus_h_hdr != xyes; then
             AC_MSG_WARN([DBus support is required for fcitx.])
         else
+            have_fcitx=yes
             AC_DEFINE(HAVE_FCITX, 1, [ ])
             SOURCES="$SOURCES $srcdir/src/core/linux/SDL_fcitx.c"
         fi
+        AC_MSG_RESULT($have_fcitx)
     fi
 }
 
@@ -4407,7 +4411,7 @@ if test x$have_ibus_ibus_h_hdr = xyes; then
 else
     SUMMARY="${SUMMARY}Using ibus          : NO\n"
 fi
-if test x$enable_fcitx = xyes; then
+if test x$have_fcitx = xyes; then
     SUMMARY="${SUMMARY}Using fcitx         : YES\n"
 else
     SUMMARY="${SUMMARY}Using fcitx         : NO\n"