[Emacs-diffs] Changes to emacs/configure.in

[Dave Love]

Index: emacs/configure.in
diff -c emacs/configure.in:1.339 emacs/configure.in:1.340
*** emacs/configure.in:1.339    Fri Jun  6 05:03:44 2003
--- emacs/configure.in  Mon Jun 23 14:35:23 2003
***************
*** 1409,1415 ****
  AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
    linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
    termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
!   sys/param.h sys/vlimit.h sys/resource.h locale.h)
  dnl On Solaris 8 there's a compilation warning for term.h because
  dnl it doesn't define `bool'.
  AC_CHECK_HEADERS(term.h, , , -)
--- 1409,1415 ----
  AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
    linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
    termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
!   sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h)
  dnl On Solaris 8 there's a compilation warning for term.h because
  dnl it doesn't define `bool'.
  AC_CHECK_HEADERS(term.h, , , -)
***************
*** 2049,2054 ****
--- 2049,2074 ----
  if test "${with_xim}" != "no"; then
    AC_DEFINE(USE_XIM, 1,
            [Define to 1 if we should use XIM, if it is available.])
+   AC_TRY_COMPILE([
+ #include <X11/Xlib.h>
+ #include <X11/Xresource.h>],
+ [Display *display;
+ XrmDatabase db;
+ char *res_name;
+ char *res_class;
+ XIMProc  callback;
+ XPointer *client_data;
+ (void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, 
callback,
+    client_data);],
+     [emacs_cv_arg6_star=yes])
+   AH_TEMPLATE(XRegisterIMInstantiateCallback_arg6,
+          [Define to the type of the 6th arg of XRegisterIMInstantiateCallback,
+ either XPointer or XPointer*.])dnl
+   if test "$emacs_cv_arg6_star" = yes; then
+      AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*])
+   else
+      AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer])
+   fi
  fi
  
  ### Use -lXpm if available, unless `--with-xpm=no'.
***************
*** 2660,2665 ****
--- 2680,2688 ----
  /* Turned on June 1996 supposing nobody will mind it.  */
  #define AMPERSAND_FULL_NAME
  
+ /* We have blockinput.h.  */
+ #define DO_BLOCK_INPUT
+ 
  /* Define HAVE_SOUND if we have sound support.  We know it works
     and compiles only on the specified platforms.   For others,
     it probably doesn't make sense to try.  */
***************
*** 2735,2740 ****
--- 2758,2765 ----
  #if ! HAVE_MKTIME || BROKEN_MKTIME
  #define mktime emacs_mktime
  #endif
+ 
+ #define my_strftime nstrftime /* for strftime.c */
  
  /* The rest of the code currently tests the CPP symbol BSTRING.
     Override any claims made by the system-description files.