diff configure @ 83548:c71725faff1a

Merged from [e-mail]. Last-minute emacsclient rewrites be damned! Patches applied: * [e-mail]/emacs--devo--0--patch-490 Update from CVS * [e-mail]/emacs--devo--0--patch-491 Update from CVS * [e-mail]/emacs--devo--0--patch-492 Update from CVS * [e-mail]/emacs--devo--0--patch-493 Update from CVS * [e-mail]/emacs--devo--0--patch-494 Update from CVS * [e-mail]/emacs--devo--0--patch-495 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-496 Update from CVS * [e-mail]/emacs--devo--0--patch-497 Update from CVS * [e-mail]/emacs--devo--0--patch-498 Update from CVS * [e-mail]/emacs--devo--0--patch-499 Update from CVS * [e-mail]/emacs--devo--0--patch-500 Update from CVS * [e-mail]/emacs--devo--0--patch-501 Update from CVS * [e-mail]/emacs--devo--0--patch-502 Update from CVS * [e-mail]/emacs--devo--0--patch-503 Update from CVS * [e-mail]/emacs--devo--0--patch-504 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-505 Update from CVS * [e-mail]/emacs--devo--0--patch-506 Update from CVS * [e-mail]/emacs--devo--0--patch-507 Update from CVS * [e-mail]/emacs--devo--0--patch-508 Update from CVS * [e-mail]/emacs--devo--0--patch-509 Update from CVS * [e-mail]/emacs--devo--0--patch-510 Update from CVS * [e-mail]/emacs--devo--0--patch-511 Update from CVS * [e-mail]/emacs--devo--0--patch-512 Update from CVS * [e-mail]/emacs--devo--0--patch-513 Update from CVS * [e-mail]/emacs--devo--0--patch-514 Update from CVS * [e-mail]/emacs--devo--0--patch-515 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-516 Update from CVS * [e-mail]/emacs--devo--0--patch-517 Update from CVS * [e-mail]/emacs--devo--0--patch-518 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-519 Update from CVS: etc/TUTORIAL.cn: Updated. * [e-mail]/emacs--devo--0--patch-520 Merge from erc--emacs--22 * [e-mail]/emacs--devo--0--patch-521 Update from CVS * [e-mail]/emacs--devo--0--patch-522 Update from CVS * [e-mail]/emacs--devo--0--patch-523 Update from CVS * [e-mail]/emacs--devo--0--patch-524 Update from CVS * [e-mail]/emacs--devo--0--patch-525 Update from CVS * [e-mail]/emacs--devo--0--patch-526 Update from CVS * [e-mail]/emacs--devo--0--patch-527 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-528 Update from CVS * [e-mail]/emacs--devo--0--patch-529 Update from CVS * [e-mail]/emacs--devo--0--patch-530 Update from CVS * [e-mail]/emacs--devo--0--patch-531 Update from CVS * [e-mail]/emacs--devo--0--patch-532 Update from CVS * [e-mail]/emacs--devo--0--patch-533 Update from CVS * [e-mail]/emacs--devo--0--patch-534 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-535 Update from CVS * [e-mail]/gnus--rel--5.10--patch-161 Update from CVS * [e-mail]/gnus--rel--5.10--patch-162 Update from CVS * [e-mail]/gnus--rel--5.10--patch-163 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-164 Update from CVS * [e-mail]/gnus--rel--5.10--patch-165 Update from CVS * [e-mail]/gnus--rel--5.10--patch-166 Update from CVS * [e-mail]/gnus--rel--5.10--patch-167 Update from CVS * [e-mail]/gnus--rel--5.10--patch-168 Update from CVS * [e-mail]/gnus--rel--5.10--patch-169 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-170 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-588

--- a/configure	Sun Dec 03 12:36:08 2006 +0000
+++ b/configure	Sun Dec 03 15:03:30 2006 +0000
@@ -2198,6 +2198,9 @@
     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
@@ -5776,6 +5779,19 @@
 
 
 
+### 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
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_X86_64_LIB64_DIR 1
+_ACEOF
+
+fi
+esac
+
 
 
 
@@ -9333,7 +9349,13 @@
 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
@@ -13404,104 +13426,6 @@
   fi
   # We also have mouse menus.
   HAVE_MENUS=yes
-
-  tmp_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -framework Carbon"
-  { echo "$as_me:$LINENO: checking for CancelMenuTracking" >&5
-echo $ECHO_N "checking for CancelMenuTracking... $ECHO_C" >&6; }
-if test "${ac_cv_func_CancelMenuTracking+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define CancelMenuTracking to an innocuous variant, in case <limits.h> declares CancelMenuTracking.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define CancelMenuTracking innocuous_CancelMenuTracking
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char CancelMenuTracking (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef CancelMenuTracking
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char CancelMenuTracking ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_CancelMenuTracking || defined __stub___CancelMenuTracking
-choke me
-#endif
-
-int
-main ()
-{
-return CancelMenuTracking ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_CancelMenuTracking=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_CancelMenuTracking=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_CancelMenuTracking" >&5
-echo "${ECHO_T}$ac_cv_func_CancelMenuTracking" >&6; }
-if test $ac_cv_func_CancelMenuTracking = yes; then
-  have_cmt=yes
-else
-  have_cmt=no
-fi
-
-  if test "$have_cmt" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CANCELMENUTRACKING 1
-_ACEOF
-
-  fi
-  CFLAGS="$tmp_CFLAGS"
 fi
 
 ### Use session management (-lSM -lICE) if available