Generated configure from recent configure.in changes (for ibus support)
authorSam Lantinga <slouken@libsdl.org>
Sat, 21 Jun 2014 12:50:03 -0700
changeset 889337a88e757435
parent 8892 2c4d3823fdbb
child 8894 d9cbf79cb236
Generated configure from recent configure.in changes (for ibus support)
configure
     1.1 --- a/configure	Sat Jun 21 12:45:54 2014 -0700
     1.2 +++ b/configure	Sat Jun 21 12:50:03 2014 -0700
     1.3 @@ -842,6 +842,7 @@
     1.4  enable_video_opengles
     1.5  enable_libudev
     1.6  enable_dbus
     1.7 +enable_ibus
     1.8  enable_input_tslib
     1.9  enable_pthreads
    1.10  enable_pthread_sem
    1.11 @@ -1573,6 +1574,7 @@
    1.12    --enable-video-opengles include OpenGL ES support [[default=yes]]
    1.13    --enable-libudev        enable libudev support [[default=yes]]
    1.14    --enable-dbus           enable D-Bus support [[default=yes]]
    1.15 +  --enable-ibus           enable IBus support [[default=yes]]
    1.16    --enable-input-tslib    use the Touchscreen library for input
    1.17                            [[default=yes]]
    1.18    --enable-pthreads       use POSIX threads for multi-threading
    1.19 @@ -21406,6 +21408,100 @@
    1.20  $as_echo "#define HAVE_DBUS_DBUS_H 1" >>confdefs.h
    1.21  
    1.22                  EXTRA_CFLAGS="$EXTRA_CFLAGS $DBUS_CFLAGS"
    1.23 +                SOURCES="$SOURCES $srcdir/src/core/linux/SDL_dbus.c"
    1.24 +            fi
    1.25 +        fi
    1.26 +    fi
    1.27 +}
    1.28 +
    1.29 +CheckIBus()
    1.30 +{
    1.31 +    # Check whether --enable-ibus was given.
    1.32 +if test "${enable_ibus+set}" = set; then :
    1.33 +  enableval=$enable_ibus;
    1.34 +else
    1.35 +  enable_ibus=yes
    1.36 +fi
    1.37 +
    1.38 +    if test x$enable_ibus = xyes; then
    1.39 +        # Extract the first word of "pkg-config", so it can be a program name with args.
    1.40 +set dummy pkg-config; ac_word=$2
    1.41 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1.42 +$as_echo_n "checking for $ac_word... " >&6; }
    1.43 +if ${ac_cv_path_PKG_CONFIG+:} false; then :
    1.44 +  $as_echo_n "(cached) " >&6
    1.45 +else
    1.46 +  case $PKG_CONFIG in
    1.47 +  [\\/]* | ?:[\\/]*)
    1.48 +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
    1.49 +  ;;
    1.50 +  *)
    1.51 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    1.52 +for as_dir in $PATH
    1.53 +do
    1.54 +  IFS=$as_save_IFS
    1.55 +  test -z "$as_dir" && as_dir=.
    1.56 +    for ac_exec_ext in '' $ac_executable_extensions; do
    1.57 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1.58 +    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    1.59 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1.60 +    break 2
    1.61 +  fi
    1.62 +done
    1.63 +  done
    1.64 +IFS=$as_save_IFS
    1.65 +
    1.66 +  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
    1.67 +  ;;
    1.68 +esac
    1.69 +fi
    1.70 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
    1.71 +if test -n "$PKG_CONFIG"; then
    1.72 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
    1.73 +$as_echo "$PKG_CONFIG" >&6; }
    1.74 +else
    1.75 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    1.76 +$as_echo "no" >&6; }
    1.77 +fi
    1.78 +
    1.79 +
    1.80 +        if test x$PKG_CONFIG != xno; then
    1.81 +            IBUS_CFLAGS=`$PKG_CONFIG --cflags ibus-1.0`
    1.82 +            save_CFLAGS="$CFLAGS"
    1.83 +            CFLAGS="$save_CFLAGS $IBUS_CFLAGS"
    1.84 +            ac_fn_c_check_header_mongrel "$LINENO" "ibus-1.0/ibus.h" "ac_cv_header_ibus_1_0_ibus_h" "$ac_includes_default"
    1.85 +if test "x$ac_cv_header_ibus_1_0_ibus_h" = xyes; then :
    1.86 +  have_ibus_ibus_h_hdr=yes
    1.87 +else
    1.88 +  have_ibus_ibus_h_hdr=no
    1.89 +fi
    1.90 +
    1.91 +
    1.92 +            ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
    1.93 +if test "x$ac_cv_header_sys_inotify_h" = xyes; then :
    1.94 +  have_inotify_inotify_h_hdr=yes
    1.95 +else
    1.96 +  have_inotify_inotify_h_hdr=no
    1.97 +fi
    1.98 +
    1.99 +
   1.100 +            CFLAGS="$save_CFLAGS"
   1.101 +            if test x$have_ibus_ibus_h_hdr = xyes; then
   1.102 +                if test x$enable_dbus != xyes; then
   1.103 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: DBus support is required for IBus." >&5
   1.104 +$as_echo "$as_me: WARNING: DBus support is required for IBus." >&2;}
   1.105 +                    have_ibus_ibus_h_hdr=no
   1.106 +                elif test x$have_inotify_inotify_h_hdr != xyes; then
   1.107 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: INotify support is required for IBus." >&5
   1.108 +$as_echo "$as_me: WARNING: INotify support is required for IBus." >&2;}
   1.109 +                    have_ibus_ibus_h_hdr=no
   1.110 +                else
   1.111 +
   1.112 +$as_echo "#define HAVE_IBUS_IBUS_H 1" >>confdefs.h
   1.113 +
   1.114 +                    EXTRA_CFLAGS="$EXTRA_CFLAGS $IBUS_CFLAGS"
   1.115 +                    SOURCES="$SOURCES $srcdir/src/core/linux/SDL_ibus.c"
   1.116 +               fi
   1.117              fi
   1.118          fi
   1.119      fi
   1.120 @@ -22680,6 +22776,7 @@
   1.121          CheckWayland
   1.122          CheckLibUDev
   1.123          CheckDBus
   1.124 +        CheckIBus
   1.125          CheckInputEvents
   1.126          CheckInputKD
   1.127          CheckTslib
   1.128 @@ -23419,6 +23516,11 @@
   1.129  else
   1.130      SUMMARY="${SUMMARY}Using dbus      : NO\n"
   1.131  fi
   1.132 +if test x$have_ibus_ibus_h_hdr = xyes; then
   1.133 +    SUMMARY="${SUMMARY}Using ibus      : YES\n"
   1.134 +else
   1.135 +    SUMMARY="${SUMMARY}Using ibus      : NO\n"
   1.136 +fi
   1.137  ac_config_commands="$ac_config_commands summary"
   1.138  
   1.139