Fixed a problem in the detection of XIM support in X11R6.

The XIM X11R6 check was being attempted before XIM support
was enabled (or disabled) in configure.in. Thus the
check was never actually made and X11R6 XIM support was always off.

This caused the resulting Eterm build to have a bug whereby if
the XIM server (kinput2) exits, as it is want to do when
it crashes from time to time, then Eterm would segfault
on reciept of a focus event. By compiling with X11R6 XIM support
Eterm received an event when kinput2 exits and it is all good.

I am not sure if this should be on for all XIM support or not.


SVN revision: 6796
This commit is contained in:
Horms 2003-03-31 09:48:46 +00:00
parent df078dd652
commit 1844b4d80a
1 changed files with 13 additions and 13 deletions

View File

@ -321,19 +321,6 @@ echo " the --x-libraries parameter to configure.";
AC_CHECK_LIB(Xext, XShapeQueryExtension, AC_DEFINE(HAVE_X_SHAPE_EXT))
# check if we need X_LOCALE definition
AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE), AC_DEFINE(NO_XLOCALE))
# For multibyte selection handling
if test "$MULTICHAR_ENCODING" != "none"; then
AC_CHECK_LIB(Xmu, XmuInternAtom)
fi
# check X11R6 for XIM
if test "$XIM" = "TRUE"; then
AC_CHECK_LIB(X11, XRegisterIMInstantiateCallback, AC_DEFINE(USE_X11R6_XIM))
fi
dnl#
dnl# FEATURES
dnl#
@ -787,6 +774,19 @@ AC_ARG_ENABLE(xim,
XIM="TRUE"
])
# check if we need X_LOCALE definition
AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE), AC_DEFINE(NO_XLOCALE))
# For multibyte selection handling
if test "$MULTICHAR_ENCODING" != "none"; then
AC_CHECK_LIB(Xmu, XmuInternAtom)
fi
# check X11R6 for XIM
if test "$XIM" = "TRUE"; then
AC_CHECK_LIB(X11, XRegisterIMInstantiateCallback, AC_DEFINE(USE_X11R6_XIM))
fi
AC_MSG_CHECKING(for Greek keyboard support)
AC_ARG_ENABLE(greek,
[ --enable-greek compile with support for Greek keyboards], [