# HG changeset patch # User Dave Love # Date 1056888068 0 # Node ID e6a0d3015a995fb7874992940dab4b71c5c6294d # Parent 0012fe6ed04323ac5a86c12247ea771fc6db3b88 Fix XRegisterIMInstantiateCallback check for gcc. diff -r 0012fe6ed043 -r e6a0d3015a99 configure.in --- a/configure.in Sun Jun 29 10:37:00 2003 +0000 +++ b/configure.in Sun Jun 29 12:01:08 2003 +0000 @@ -2049,6 +2049,10 @@ 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" + fi AC_TRY_COMPILE([ #include #include ], @@ -2058,6 +2062,12 @@ char *res_class; XIMProc callback; XPointer *client_data; +#ifndef __GNUC__ +/* If we're not using GCC, it's probably not XFree86, and this is + probably right, but we can't use something like --pedantic-errors. */ +extern Bool XRegisterIMInstantiateCallback(Display*, XrmDatabase, char*, + char*, XIMProc, XPointer*); +#endif (void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback, client_data);], [emacs_cv_arg6_star=yes]) @@ -2069,6 +2079,7 @@ else AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer]) fi + CFLAGS=$late_CFLAGS fi ### Use -lXpm if available, unless `--with-xpm=no'.