(Ffind_operation_coding_system): Fix Lisp_Object/int mixup.

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index 054a5567221dd1a5768ffe8d071879c0809bf458..ef93016d717968b6bcff73d0d9f23b31ad15ec65 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -38,25 +38,9 @@ lisppath='${locallisppath}:${lispdir}'
 etcdir='${datadir}/emacs/${version}/etc'
 archlibdir='${libexecdir}/emacs/${version}/${configuration}'
 docdir='${datadir}/emacs/${version}/etc'
-gamedir=yes
-
-AC_ARG_WITH(game-dir,
-[  --with-game-dir         use a shared game directory if possible],
-   [if test "$withval" = yes; then
-      gamedir="${localstatedir}/games/emacs"
-    else
-      if test "$withval" = no; then
-        gamedir=no
-      else
-        gamedir="$withval"
-      fi
-    fi
-])
+gamedir='${localstatedir}/games/emacs'
 
 gameuser=games
-AC_ARG_WITH(game-user,
-[  --with-game-user        use specified user for game directory],
-   [gameuser="$withval"])
 
 AC_ARG_WITH(gcc,
 [  --without-gcc           don't use GCC to compile Emacs if GCC is found])
@@ -235,6 +219,7 @@ case "${canonical}" in
       powerpc-apple-netbsd*) machine=macppc ;;
       mips-*-netbsd*)  machine=pmax ;;
       mipsel-*-netbsd*)        machine=pmax ;;
+      mipseb-*-netbsd*)        machine=pmax ;;
       ns32k-*-netbsd*) machine=ns32000 ;;
       powerpc-*-netbsd*) machine=macppc ;;
       sparc*-*-netbsd*)        machine=sparc ;;
@@ -1113,6 +1098,11 @@ case "${canonical}" in
     CPP="cc -E -traditional-cpp"
   ;;
 
+  ## AMD x86-64 Linux-based GNU system
+  x86_64-*-linux-gnu* )
+    machine=amdx86-64 opsys=gnu-linux 
+  ;;
+
   * )
     unported=yes
   ;;
@@ -1425,10 +1415,11 @@ AC_TYPE_SIGNAL
 
 dnl Check for speed_t typedef.
 AC_CACHE_CHECK(for speed_t, emacs_cv_speed_t,
-AC_TRY_COMPILE([#include <termios.h>], [speed_t x = 1;],
-  emacs_cv_speed_t=yes, emacs_cv_speed_t=no))
+  [AC_TRY_COMPILE([#include <termios.h>], [speed_t x = 1;],
+    emacs_cv_speed_t=yes, emacs_cv_speed_t=no)])
 if test $emacs_cv_speed_t = yes; then
-  AC_DEFINE(HAVE_SPEED_T, 1, [Define to 1 if `speed_t' is declared by <termios.h>.])
+  AC_DEFINE(HAVE_SPEED_T, 1, 
+          [Define to 1 if `speed_t' is declared by <termios.h>.])
 fi
 
 AC_CACHE_CHECK(for struct timeval, emacs_cv_struct_timeval,
@@ -1495,26 +1486,6 @@ AC_PROG_MAKE_SET
 dnl checks for operating system services
 AC_SYS_LONG_FILE_NAMES
 
-if test "$gamedir" = no; then :
-else
-  AC_MSG_CHECKING([for access to game group "$gameuser"])
-  rm -f conf$$chown.file
-  touch conf$$chown.file
-  dnl If we can't chown a file to group games, then the users
-  dnl can't share scores.
-  if chown "$gameuser" conf$$chown.file 1>/dev/null 2>&1; then
-    AC_MSG_RESULT([yes])
-    if test "$gamedir" = "yes"; then
-      gamedir="${localstatedir}/games/emacs"
-    fi
-    eval tgamedir=\"$gamedir\"
-    AC_DEFINE_UNQUOTED(HAVE_SHARED_GAME_DIR, "$tgamedir",
-                      [Define to the name of the shared game directory.])
-  else
-    AC_MSG_RESULT([no])
-    gamedir=no
-  fi
-fi
 #### Choose a window system.
 
 AC_PATH_X
@@ -2013,7 +1984,7 @@ if test "${with_carbon}" != "no"; then
 fi
 
 if test "${HAVE_CARBON}" = "yes"; then
-  AC_DEFINE(HAVE_CARBON)
+  AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
 fi
 
 ### Use session management (-lSM -lICE) if available
@@ -2429,6 +2400,14 @@ AH_BOTTOM([
 #define HAVE_MOUSE
 #endif
 
+/* If we're using the Carbon API on Mac OS X, define a few more
+   variables as well.  */
+#ifdef HAVE_CARBON
+#define HAVE_WINDOW_SYSTEM
+#define HAVE_MOUSE
+#define HAVE_MENUS
+#endif
+
 /* Define USER_FULL_NAME to return a string
    that is the user's full name.
    It can assume that the variable `pw'
@@ -2628,8 +2607,7 @@ Configured for \`${canonical}'.
   Should Emacs use a relocating allocator for buffers?    ${REL_ALLOC}
   Should Emacs use mmap(2) for buffer allocation?         $use_mmap_for_buffers
   What window system should Emacs use?                    ${window_system}
-  What toolkit should Emacs use?                          ${USE_X_TOOLKIT}
-  Should Emacs use a shared game state directory?         ${gamedir}"
+  What toolkit should Emacs use?                          ${USE_X_TOOLKIT}"
 
 if test -n "${x_includes}"; then
 echo "  Where do we find X Windows header files?                ${x_includes}"