aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2018-08-27 21:44:29 -0400
committerGlenn Morris2018-08-27 21:44:29 -0400
commit2695b7e74559318cee2b4e69c2f94ac22421d134 (patch)
tree5cb1fc480a9aa6249547e07d54efbccdc52d9be6
parentd0d162c2d63600435622ad4cb5e67e98d1a36da4 (diff)
downloademacs-2695b7e74559318cee2b4e69c2f94ac22421d134.tar.gz
emacs-2695b7e74559318cee2b4e69c2f94ac22421d134.zip
* configure.ac: Doc fixes related to --with-xim.
-rw-r--r--configure.ac9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 3d39cd0c3ba..868930bb5ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -362,7 +362,7 @@ OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
362 362
363OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars]) 363OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
364OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d]) 364OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
365OPTION_DEFAULT_ON([xim],[don't use X11 XIM]) 365OPTION_DEFAULT_ON([xim],[at runtime, default X11 XIM to off])
366AC_ARG_WITH([ns],[AS_HELP_STRING([--with-ns], 366AC_ARG_WITH([ns],[AS_HELP_STRING([--with-ns],
367[use Nextstep (macOS Cocoa or GNUstep) windowing system. 367[use Nextstep (macOS Cocoa or GNUstep) windowing system.
368On by default on macOS.])],[],[with_ns=maybe]) 368On by default on macOS.])],[],[with_ns=maybe])
@@ -3149,11 +3149,12 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
3149 AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])], 3149 AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])],
3150 HAVE_XIM=no) 3150 HAVE_XIM=no)
3151 3151
3152dnl '--with-xim' now controls only the initial value of use_xim at run time. 3152dnl Note this is non-standard. --with-xim does not control whether
3153 3153dnl XIM support is compiled in, it only affects the runtime default of
3154dnl use_xim in xterm.c.
3154if test "${with_xim}" != "no"; then 3155if test "${with_xim}" != "no"; then
3155 AC_DEFINE(USE_XIM, 1, 3156 AC_DEFINE(USE_XIM, 1,
3156 [Define to 1 if we should use XIM, if it is available.]) 3157 [Define to 1 to default runtime use of XIM to on.])
3157fi 3158fi
3158 3159
3159 3160