Merged from [email protected]. Last-minute emacsclient rewrites be damned!

Patches applied:

 * [email protected]/emacs--devo--0--patch-490
   Update from CVS

 * [email protected]/emacs--devo--0--patch-491
   Update from CVS

 * [email protected]/emacs--devo--0--patch-492
   Update from CVS

 * [email protected]/emacs--devo--0--patch-493
   Update from CVS

 * [email protected]/emacs--devo--0--patch-494
   Update from CVS

 * [email protected]/emacs--devo--0--patch-495
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-496
   Update from CVS

 * [email protected]/emacs--devo--0--patch-497
   Update from CVS

 * [email protected]/emacs--devo--0--patch-498
   Update from CVS

 * [email protected]/emacs--devo--0--patch-499
   Update from CVS

 * [email protected]/emacs--devo--0--patch-500
   Update from CVS

 * [email protected]/emacs--devo--0--patch-501
   Update from CVS

 * [email protected]/emacs--devo--0--patch-502
   Update from CVS

 * [email protected]/emacs--devo--0--patch-503
   Update from CVS

 * [email protected]/emacs--devo--0--patch-504
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-505
   Update from CVS

 * [email protected]/emacs--devo--0--patch-506
   Update from CVS

 * [email protected]/emacs--devo--0--patch-507
   Update from CVS

 * [email protected]/emacs--devo--0--patch-508
   Update from CVS

 * [email protected]/emacs--devo--0--patch-509
   Update from CVS

 * [email protected]/emacs--devo--0--patch-510
   Update from CVS

 * [email protected]/emacs--devo--0--patch-511
   Update from CVS

 * [email protected]/emacs--devo--0--patch-512
   Update from CVS

 * [email protected]/emacs--devo--0--patch-513
   Update from CVS

 * [email protected]/emacs--devo--0--patch-514
   Update from CVS

 * [email protected]/emacs--devo--0--patch-515
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-516
   Update from CVS

 * [email protected]/emacs--devo--0--patch-517
   Update from CVS

 * [email protected]/emacs--devo--0--patch-518
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-519
   Update from CVS: etc/TUTORIAL.cn: Updated.

 * [email protected]/emacs--devo--0--patch-520
   Merge from erc--emacs--22

 * [email protected]/emacs--devo--0--patch-521
   Update from CVS

 * [email protected]/emacs--devo--0--patch-522
   Update from CVS

 * [email protected]/emacs--devo--0--patch-523
   Update from CVS

 * [email protected]/emacs--devo--0--patch-524
   Update from CVS

 * [email protected]/emacs--devo--0--patch-525
   Update from CVS

 * [email protected]/emacs--devo--0--patch-526
   Update from CVS

 * [email protected]/emacs--devo--0--patch-527
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-528
   Update from CVS

 * [email protected]/emacs--devo--0--patch-529
   Update from CVS

 * [email protected]/emacs--devo--0--patch-530
   Update from CVS

 * [email protected]/emacs--devo--0--patch-531
   Update from CVS

 * [email protected]/emacs--devo--0--patch-532
   Update from CVS

 * [email protected]/emacs--devo--0--patch-533
   Update from CVS

 * [email protected]/emacs--devo--0--patch-534
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-535
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-161
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-162
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-163
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-164
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-165
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-166
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-167
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-168
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-169
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-170
   Update from CVS

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-588

1 files changed, 20 insertions, 10 deletions

diff --git a/configure.in b/configure.in
index 01e5cedb40..86b4811770 100644
--- a/configure.in
+++ b/configure.in
@@ -237,6 +237,9 @@ case "${canonical}" in
     opsys=freebsd
     case "${canonical}" in
       alpha*-*-freebsd*)	machine=alpha ;;
+      ia64-*-freebsd*)		machine=ia64 ;;
+      sparc64-*-freebsd*)	machine=sparc ;;
+      powerpc-*-freebsd*)	machine=macppc ;;
       i[3456]86-*-freebsd*)	machine=intel386 ;;
       amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
     esac
@@ -1482,6 +1485,16 @@ dnl Do this early because it can frob feature test macros for Unix-98 &c.
 AC_SYS_LARGEFILE
 
 
+### The standard library on x86-64 GNU/Linux distributions can 
+### be located in either /usr/lib64 or /usr/lib.
+case "${canonical}" in
+  x86_64-*-linux-gnu* )
+    if test -d /usr/lib64; then
+      AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
+        [Define to 1 if the file /usr/lib64 exists.])
+fi
+esac
+
 dnl This function defintion taken from Gnome 2.0
 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
@@ -1776,7 +1789,13 @@ fi
 if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
   if test "${with_carbon+set}" != set \
      && test "${carbon_appdir_x+set}" != set; then
-    HAVE_CARBON=no
+    for var in with_x with_x_toolkit with_gtk with_xim \
+               with_xpm with_jpeg with_tiff with_gif with_png; do
+      if eval test \"\${$var+set}\" = set; then
+        HAVE_CARBON=no
+        break
+      fi
+    done
   fi
 fi
 if test "${HAVE_CARBON}" = yes; then
@@ -2410,15 +2429,6 @@ if test "${HAVE_CARBON}" = "yes"; then
   fi
   # We also have mouse menus.
   HAVE_MENUS=yes
-
-  tmp_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -framework Carbon"
-  AC_CHECK_FUNC(CancelMenuTracking, have_cmt=yes, have_cmt=no)
-  if test "$have_cmt" = yes; then
-    AC_DEFINE(HAVE_CANCELMENUTRACKING, 1,
-              [Define to 1 if CancelMenuTracking is available (Mac OSX).])
-  fi
-  CFLAGS="$tmp_CFLAGS"
 fi
 
 ### Use session management (-lSM -lICE) if available