Commit 8bd3b2c80118d582dec4c1d74a755944d64f4628
2020-05-20T16:34:19
configure: fix fcitx tests. Otherwise Unix systems without D-Bus support will attempt to compile sources they can't handle.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/configure b/configure
index 6a8b84c..f1c2e04 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 19db775..36e7086 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"