[Emacs-diffs] Changes to emacs/configure

[Andrew Choi]

Index: emacs/configure
diff -c emacs/configure:1.119 emacs/configure:1.120
*** emacs/configure:1.119       Mon Jul 28 14:04:15 2003
--- emacs/configure     Thu Aug  7 12:00:31 2003
***************
*** 2576,2582 ****
    powerpc-apple-darwin* )
      machine=powermac opsys=darwin
      # Define CPP as follows to make autoconf work correctly.
!     CPP="cc -E -traditional-cpp"
    ;;
  
    ## AMD x86-64 Linux-based GNU system
--- 2576,2582 ----
    powerpc-apple-darwin* )
      machine=powermac opsys=darwin
      # Define CPP as follows to make autoconf work correctly.
!     CPP="gcc -E -no-cpp-precomp"
    ;;
  
    ## AMD x86-64 Linux-based GNU system
***************
*** 3420,3426 ****
    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 ();' \
--- 3420,3427 ----
    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 ();' \
***************
*** 3434,3441 ****
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
- $ac_declaration
  #include <stdlib.h>
  int
  main ()
  {
--- 3435,3442 ----
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdlib.h>
+ $ac_declaration
  int
  main ()
  {
***************
*** 8191,8197 ****
     { (exit 1); exit 1; }; };
    fi
    GLIB_REQUIRED=2.0.1
!   GTK_REQUIRED=2.0.1
    GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
  
      if test "X${with_pkg_config_prog}" != X; then
--- 8192,8198 ----
     { (exit 1); exit 1; }; };
    fi
    GLIB_REQUIRED=2.0.1
!   GTK_REQUIRED=2.2
    GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
  
      if test "X${with_pkg_config_prog}" != X; then
***************
*** 8910,8915 ****
--- 8911,8960 ----
    fi
  fi
  
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+         #include <X11/Xlib.h>
+         #include <X11/Xresource.h>
+ int
+ main ()
+ {
+ XIMProc  callback;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   HAVE_XIM=yes
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_XIM 1
+ _ACEOF
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ HAVE_XIM=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
  
  if test "${with_xim}" != "no"; then
  
***************
*** 8918,8924 ****
  _ACEOF
  
  fi
! if test "${HAVE_X11}" = "yes"; then
    late_CFLAGS=$CFLAGS
    if test "$GCC" = yes; then
      CFLAGS="$CFLAGS --pedantic-errors"
--- 8963,8971 ----
  _ACEOF
  
  fi
! 
! 
! if test "${HAVE_XIM}" != "no"; then
    late_CFLAGS=$CFLAGS
    if test "$GCC" = yes; then
      CFLAGS="$CFLAGS --pedantic-errors"