[Emacs-diffs] Changes to emacs/configure

[Dave Love]

Index: emacs/configure
diff -c emacs/configure:1.112 emacs/configure:1.113
*** emacs/configure:1.112       Thu Jun 26 17:09:11 2003
--- emacs/configure     Sun Jun 29 08:05:01 2003
***************
*** 3396,3403 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    for ac_declaration in \
!    ''\
!    '#include <stdlib.h>' \
     'extern "C" void std::exit (int) throw (); using std::exit;' \
     'extern "C" void std::exit (int); using std::exit;' \
     'extern "C" void exit (int) throw ();' \
--- 3396,3402 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    for ac_declaration in \
!    '' \
     'extern "C" void std::exit (int) throw (); using std::exit;' \
     'extern "C" void std::exit (int); using std::exit;' \
     'extern "C" void exit (int) throw ();' \
***************
*** 3411,3418 ****
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
- #include <stdlib.h>
  $ac_declaration
  int
  main ()
  {
--- 3410,3417 ----
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_declaration
+ #include <stdlib.h>
  int
  main ()
  {
***************
*** 8894,8899 ****
--- 8893,8902 ----
  #define USE_XIM 1
  _ACEOF
  
+   late_CFLAGS=$CFLAGS
+   if test "$GCC" = yes; then
+     CFLAGS="$CFLAGS --pedantic-errors"
+   fi
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
***************
*** 8913,8918 ****
--- 8916,8927 ----
  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);
    ;
***************
*** 8950,8955 ****
--- 8959,8965 ----
  _ACEOF
  
    fi
+   CFLAGS=$late_CFLAGS
  fi
  
  ### Use -lXpm if available, unless `--with-xpm=no'.