configure: Regenerate configure script.
authorRyan C. Gordon <icculus@icculus.org>
Tue, 19 May 2020 11:52:15 -0400
changeset 138310522c30c1990
parent 13830 63e3318077dd
child 13832 b65783853022
configure: Regenerate configure script.
configure
     1.1 --- a/configure	Tue May 19 11:48:22 2020 -0400
     1.2 +++ b/configure	Tue May 19 11:52:15 2020 -0400
     1.3 @@ -655,8 +655,6 @@
     1.4  INSTALL_SDL2_CONFIG
     1.5  LIBUSB_LIBS
     1.6  LIBUSB_CFLAGS
     1.7 -FCITX_LIBS
     1.8 -FCITX_CFLAGS
     1.9  IBUS_LIBS
    1.10  IBUS_CFLAGS
    1.11  DBUS_LIBS
    1.12 @@ -940,8 +938,6 @@
    1.13  DBUS_LIBS
    1.14  IBUS_CFLAGS
    1.15  IBUS_LIBS
    1.16 -FCITX_CFLAGS
    1.17 -FCITX_LIBS
    1.18  LIBUSB_CFLAGS
    1.19  LIBUSB_LIBS'
    1.20  
    1.21 @@ -1768,9 +1764,6 @@
    1.22    DBUS_LIBS   linker flags for DBUS, overriding pkg-config
    1.23    IBUS_CFLAGS C compiler flags for IBUS, overriding pkg-config
    1.24    IBUS_LIBS   linker flags for IBUS, overriding pkg-config
    1.25 -  FCITX_CFLAGS
    1.26 -              C compiler flags for FCITX, overriding pkg-config
    1.27 -  FCITX_LIBS  linker flags for FCITX, overriding pkg-config
    1.28    LIBUSB_CFLAGS
    1.29                C compiler flags for LIBUSB, overriding pkg-config
    1.30    LIBUSB_LIBS linker flags for LIBUSB, overriding pkg-config
    1.31 @@ -16007,7 +16000,7 @@
    1.32          ;;
    1.33  esac
    1.34  
    1.35 -INCLUDE="-I$srcdir/include -idirafter $srcdir/src/video/khronos"
    1.36 +INCLUDE="-I$srcdir/include -I$srcdir/src/video/khronos"
    1.37  if test x$srcdir != x.; then
    1.38      INCLUDE="-Iinclude $INCLUDE"
    1.39  elif test -d .hg; then
    1.40 @@ -23081,101 +23074,17 @@
    1.41  fi
    1.42  
    1.43      if test x$enable_fcitx = xyes; then
    1.44 -
    1.45 -pkg_failed=no
    1.46 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FCITX" >&5
    1.47 -$as_echo_n "checking for FCITX... " >&6; }
    1.48 -
    1.49 -if test -n "$FCITX_CFLAGS"; then
    1.50 -    pkg_cv_FCITX_CFLAGS="$FCITX_CFLAGS"
    1.51 - elif test -n "$PKG_CONFIG"; then
    1.52 -    if test -n "$PKG_CONFIG" && \
    1.53 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fcitx\""; } >&5
    1.54 -  ($PKG_CONFIG --exists --print-errors "fcitx") 2>&5
    1.55 -  ac_status=$?
    1.56 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1.57 -  test $ac_status = 0; }; then
    1.58 -  pkg_cv_FCITX_CFLAGS=`$PKG_CONFIG --cflags "fcitx" 2>/dev/null`
    1.59 -else
    1.60 -  pkg_failed=yes
    1.61 -fi
    1.62 - else
    1.63 -    pkg_failed=untried
    1.64 -fi
    1.65 -if test -n "$FCITX_LIBS"; then
    1.66 -    pkg_cv_FCITX_LIBS="$FCITX_LIBS"
    1.67 - elif test -n "$PKG_CONFIG"; then
    1.68 -    if test -n "$PKG_CONFIG" && \
    1.69 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fcitx\""; } >&5
    1.70 -  ($PKG_CONFIG --exists --print-errors "fcitx") 2>&5
    1.71 -  ac_status=$?
    1.72 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1.73 -  test $ac_status = 0; }; then
    1.74 -  pkg_cv_FCITX_LIBS=`$PKG_CONFIG --libs "fcitx" 2>/dev/null`
    1.75 -else
    1.76 -  pkg_failed=yes
    1.77 -fi
    1.78 - else
    1.79 -    pkg_failed=untried
    1.80 -fi
    1.81 -
    1.82 -
    1.83 -
    1.84 -if test $pkg_failed = yes; then
    1.85 -   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    1.86 -$as_echo "no" >&6; }
    1.87 -
    1.88 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
    1.89 -        _pkg_short_errors_supported=yes
    1.90 -else
    1.91 -        _pkg_short_errors_supported=no
    1.92 -fi
    1.93 -        if test $_pkg_short_errors_supported = yes; then
    1.94 -	        FCITX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fcitx" 2>&1`
    1.95 +        if test x$enable_ime != xyes; then
    1.96 +            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IME support is required for fcitx." >&5
    1.97 +$as_echo "$as_me: WARNING: IME support is required for fcitx." >&2;}
    1.98 +        elif test x$enable_dbus != xyes; then
    1.99 +            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: DBus support is required for fcitx." >&5
   1.100 +$as_echo "$as_me: WARNING: DBus support is required for fcitx." >&2;}
   1.101          else
   1.102 -	        FCITX_PKG_ERRORS=`$PKG_CONFIG --print-errors "fcitx" 2>&1`
   1.103 -        fi
   1.104 -	# Put the nasty error message in config.log where it belongs
   1.105 -	echo "$FCITX_PKG_ERRORS" >&5
   1.106 -
   1.107 -	have_fcitx=no
   1.108 -elif test $pkg_failed = untried; then
   1.109 -     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   1.110 -$as_echo "no" >&6; }
   1.111 -	have_fcitx=no
   1.112 -else
   1.113 -	FCITX_CFLAGS=$pkg_cv_FCITX_CFLAGS
   1.114 -	FCITX_LIBS=$pkg_cv_FCITX_LIBS
   1.115 -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   1.116 -$as_echo "yes" >&6; }
   1.117 -	have_fcitx=yes
   1.118 -fi
   1.119 -        CFLAGS="$CFLAGS $FCITX_CFLAGS"
   1.120 -        ac_fn_c_check_header_mongrel "$LINENO" "fcitx/frontend.h" "ac_cv_header_fcitx_frontend_h" "$ac_includes_default"
   1.121 -if test "x$ac_cv_header_fcitx_frontend_h" = xyes; then :
   1.122 -  have_fcitx_frontend_h_hdr=yes
   1.123 -else
   1.124 -  have_fcitx_frontend_h_hdr=no
   1.125 -fi
   1.126 -
   1.127 -
   1.128 -        CFLAGS="$save_CFLAGS"
   1.129 -        if test x$have_fcitx_frontend_h_hdr = xyes; then
   1.130 -            if test x$enable_ime != xyes; then
   1.131 -                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IME support is required for fcitx." >&5
   1.132 -$as_echo "$as_me: WARNING: IME support is required for fcitx." >&2;}
   1.133 -                have_fcitx_frontend_h_hdr=no
   1.134 -            elif test x$enable_dbus != xyes; then
   1.135 -                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: DBus support is required for fcitx." >&5
   1.136 -$as_echo "$as_me: WARNING: DBus support is required for fcitx." >&2;}
   1.137 -                have_fcitx_frontend_h_hdr=no
   1.138 -            else
   1.139 -
   1.140 -$as_echo "#define HAVE_FCITX_FRONTEND_H 1" >>confdefs.h
   1.141 -
   1.142 -                EXTRA_CFLAGS="$EXTRA_CFLAGS $FCITX_CFLAGS"
   1.143 -                SOURCES="$SOURCES $srcdir/src/core/linux/SDL_fcitx.c"
   1.144 -            fi
   1.145 +
   1.146 +$as_echo "#define HAVE_FCITX 1" >>confdefs.h
   1.147 +
   1.148 +            SOURCES="$SOURCES $srcdir/src/core/linux/SDL_fcitx.c"
   1.149          fi
   1.150      fi
   1.151  }
   1.152 @@ -25857,7 +25766,7 @@
   1.153  else
   1.154      SUMMARY="${SUMMARY}Using ibus          : NO\n"
   1.155  fi
   1.156 -if test x$have_fcitx_frontend_h_hdr = xyes; then
   1.157 +if test x$enable_fcitx = xyes; then
   1.158      SUMMARY="${SUMMARY}Using fcitx         : YES\n"
   1.159  else
   1.160      SUMMARY="${SUMMARY}Using fcitx         : NO\n"