Mercurial > emacs
comparison configure.in @ 51690:e6a0d3015a99
Fix XRegisterIMInstantiateCallback check for gcc.
author | Dave Love <fx@gnu.org> |
---|---|
date | Sun, 29 Jun 2003 12:01:08 +0000 |
parents | 8e29225b8438 |
children | 1167403cc11b |
comparison
equal
deleted
inserted
replaced
51689:0012fe6ed043 | 51690:e6a0d3015a99 |
---|---|
2047 dnl with `--with-xim=no'. | 2047 dnl with `--with-xim=no'. |
2048 | 2048 |
2049 if test "${with_xim}" != "no"; then | 2049 if test "${with_xim}" != "no"; then |
2050 AC_DEFINE(USE_XIM, 1, | 2050 AC_DEFINE(USE_XIM, 1, |
2051 [Define to 1 if we should use XIM, if it is available.]) | 2051 [Define to 1 if we should use XIM, if it is available.]) |
2052 late_CFLAGS=$CFLAGS | |
2053 if test "$GCC" = yes; then | |
2054 CFLAGS="$CFLAGS --pedantic-errors" | |
2055 fi | |
2052 AC_TRY_COMPILE([ | 2056 AC_TRY_COMPILE([ |
2053 #include <X11/Xlib.h> | 2057 #include <X11/Xlib.h> |
2054 #include <X11/Xresource.h>], | 2058 #include <X11/Xresource.h>], |
2055 [Display *display; | 2059 [Display *display; |
2056 XrmDatabase db; | 2060 XrmDatabase db; |
2057 char *res_name; | 2061 char *res_name; |
2058 char *res_class; | 2062 char *res_class; |
2059 XIMProc callback; | 2063 XIMProc callback; |
2060 XPointer *client_data; | 2064 XPointer *client_data; |
2065 #ifndef __GNUC__ | |
2066 /* If we're not using GCC, it's probably not XFree86, and this is | |
2067 probably right, but we can't use something like --pedantic-errors. */ | |
2068 extern Bool XRegisterIMInstantiateCallback(Display*, XrmDatabase, char*, | |
2069 char*, XIMProc, XPointer*); | |
2070 #endif | |
2061 (void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback, | 2071 (void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback, |
2062 client_data);], | 2072 client_data);], |
2063 [emacs_cv_arg6_star=yes]) | 2073 [emacs_cv_arg6_star=yes]) |
2064 AH_TEMPLATE(XRegisterIMInstantiateCallback_arg6, | 2074 AH_TEMPLATE(XRegisterIMInstantiateCallback_arg6, |
2065 [Define to the type of the 6th arg of XRegisterIMInstantiateCallback, | 2075 [Define to the type of the 6th arg of XRegisterIMInstantiateCallback, |
2067 if test "$emacs_cv_arg6_star" = yes; then | 2077 if test "$emacs_cv_arg6_star" = yes; then |
2068 AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*]) | 2078 AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*]) |
2069 else | 2079 else |
2070 AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer]) | 2080 AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer]) |
2071 fi | 2081 fi |
2082 CFLAGS=$late_CFLAGS | |
2072 fi | 2083 fi |
2073 | 2084 |
2074 ### Use -lXpm if available, unless `--with-xpm=no'. | 2085 ### Use -lXpm if available, unless `--with-xpm=no'. |
2075 HAVE_XPM=no | 2086 HAVE_XPM=no |
2076 if test "${HAVE_X11}" = "yes"; then | 2087 if test "${HAVE_X11}" = "yes"; then |