(c-lineup-string-cont): Doc fix (Nil -> nil).

[gnu-emacs] / configure

diff --git a/configure b/configure
index 2fad7c5c3fa86ef556a7f278c6aa510f5210e553..a064d33d46fd76eb325520b06b89f67403f0e5f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1717,6 +1717,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
@@ -1757,6 +1760,7 @@ _ACEOF
     case "${canonical}" in
       alpha*-*-openbsd*)       machine=alpha ;;
       i386-*-openbsd*) machine=intel386 ;;
+      x86_64-*-openbsd*)    machine=amdx86-64 ;;
       m68k-*-openbsd*)  machine=hp9000s300 ;;
       mipsel-*-openbsd*) machine=pmax ;;
       ns32k-*-openbsd*)        machine=ns32000 ;;
@@ -8806,7 +8810,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