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],
- [
- gamedir="$withval"
-])
-if test "$gamedir" = yes; then
- gamedir="${localstatedir}/games/emacs"
-fi
-eval tgamedir=\"$gamedir\"
-if test "$gamedir" != no; then
- AC_DEFINE_UNQUOTED(HAVE_SHARED_GAME_DIR, "$tgamedir",
- [Define to the name of the shared game directory.])
-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])
CC="$CC $NON_GCC_TEST_OPTIONS"
fi
-if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
-then
- ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
-fi
-
-if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x
-then
- ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
-fi
-
#### Some other nice autoconf tests. If you add a test here which
#### should make an entry in src/config.h, don't forget to add an
#### #undef clause to src/config.h.in for autoconf to modify.
AC_PROG_RANLIB
fi
+dnl Add our options to ac_link now, after it is set up.
+
+if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
+then
+ ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
+fi
+
+if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x
+then
+ ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
+fi
+
dnl checks for Unix variants
AC_AIX
fi
if test "${USE_X_TOOLKIT}" = "MOTIF"; then
+ AC_CACHE_CHECK(for LessTif where some systems put it,
+ [AC_TRY_COMPILE([#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>],
+ [int x = 5;],
+ emacs_cv_lesstif=yes, emacs_cv_lesstif=no)
+ if test $emacs_cv_lesstif = yes; then
+ CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
+ LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS"
+ fi
AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1,
[AC_TRY_COMPILE([#include <Xm/Xm.h>],
[#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1)
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}"