Re: XIM

[Richard Stallman]

These two changes (plus regenerating configure and config.in)
I think will solve the problem.  Do they?


*** xterm.c.~1.802.~    Sun Jul 13 14:07:21 2003
--- xterm.c     Tue Jul 22 15:05:42 2003
***************
*** 8024,8029 ****
--- 8024,8030 ----
  {
    XIM xim;
  
+ #ifdef HAVE_XIM
    if (use_xim)
      {
        xim = XOpenIM (dpyinfo->display, dpyinfo->xrdb, resource_name,
***************
*** 8048,8053 ****
--- 8049,8055 ----
      }
  
    else
+ #endif /* HAVE_XIM */
      dpyinfo->xim = NULL;
  }
  
***************
*** 8122,8127 ****
--- 8124,8130 ----
       struct x_display_info *dpyinfo;
       char *resource_name;
  {
+ #ifdef HAVE_XIM
    if (use_xim)
      {
  #ifdef HAVE_X11R6_XIM
***************
*** 8148,8153 ****
--- 8151,8157 ----
  
      }
    else
+ #endif /* HAVE_XIM */
      dpyinfo->xim = NULL;
  }
  
***************
*** 8158,8163 ****
--- 8162,8168 ----
  xim_close_dpy (dpyinfo)
       struct x_display_info *dpyinfo;
  {
+ #ifdef HAVE_XIM
    if (use_xim)
      {
  #ifdef HAVE_X11R6_XIM
***************
*** 8171,8176 ****
--- 8176,8182 ----
        dpyinfo->xim = NULL;
        XFree (dpyinfo->xim_styles);
      }
+ #endif /* HAVE_XIM */
  }
  
  #endif /* not HAVE_X11R6_XIM */


cd ~/emacs/
diff -c /home/rms/emacs/configure.in.\~1.342.\~ /home/rms/emacs/configure.in
*** /home/rms/emacs/configure.in.~1.342.~       Sat Jul 12 18:06:27 2003
--- /home/rms/emacs/configure.in        Tue Jul 22 15:05:12 2003
***************
*** 2047,2058 ****
    fi
  fi
  
! dnl Don't use X11 input methods if user specifies he doesn't want it
! dnl with `--with-xim=no'.
  
  if test "${with_xim}" != "no"; then
    AC_DEFINE(USE_XIM, 1,
            [Define to 1 if we should use XIM, if it is available.])
    late_CFLAGS=$CFLAGS
    if test "$GCC" = yes; then
      CFLAGS="$CFLAGS --pedantic-errors"
--- 2054,2078 ----
    fi
  fi
  
! dnl See if XIM is available.
! AC_TRY_COMPILE([
!         #include <X11/Xlib.h>
!         #include <X11/Xresource.h>],
!        [XIMProc  callback;],
!        HAVE_XIM=yes
!        AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available]),
!        HAVE_XIM=no)
! 
! dnl `--with-xim' now controls only the initial value of use_xim at run time.
  
  if test "${with_xim}" != "no"; then
    AC_DEFINE(USE_XIM, 1,
            [Define to 1 if we should use XIM, if it is available.])
+ fi
+  
+ 
+ if test "${have_xim}" != "no"; then
+   AC_DEFINE(HAVE_XIM),
    late_CFLAGS=$CFLAGS
    if test "$GCC" = yes; then
      CFLAGS="$CFLAGS --pedantic-errors"
***************
*** 2141,2148 ****
  HAVE_PNG=no
  if test "${HAVE_X11}" = "yes"; then
    if test "${with_png}" != "no"; then
!     AC_CHECK_HEADER(png.h,
!       AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm))
    fi
  
    if test "${HAVE_PNG}" = "yes"; then
--- 2161,2172 ----
  HAVE_PNG=no
  if test "${HAVE_X11}" = "yes"; then
    if test "${with_png}" != "no"; then
!     AC_CHECK_HEADER(png.h, AC_DEFINE (HAVE_PNG_H, 1, [Define to 1 if you have 
png.h]))
!     AC_CHECK_HEADER(libpng/png.h, AC_DEFINE (HAVE_LIBPNG_PNG_H, 1, [Define to 
1 if you have libpng/png.h]))
! 
!     if test "${HAVE_PNG_H}" = "yes" || "${HAVE_LIBPNG_PNG_H}" = "yes"; then
!       AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm)
!     fi
    fi
  
    if test "${HAVE_PNG}" = "yes"; then
  

Diff finished at Tue Jul 22 15:07:01