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])
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 ;;
;;
## PowerPC reference platform
- powerpcle-*-solaris2* )
+ powerpcle-*-solaris2.5* )
machine=prep
opsys=sol2-5
;;
+ ## PowerPC reference platform
+ powerpcle-*-solaris2* )
+ machine=prep
+ opsys=sol2-6
+ ;;
+
## Pyramid machines
## I don't really have any idea what sort of processor the Pyramid has,
## so I'm assuming it is its own architecture.
NON_GNU_CPP=/usr/ccs/lib/cpp
RANLIB="ar -ts"
;;
+ *-sunos5.6* | *-solaris2.6* )
+ opsys=sol2-6
+ NON_GNU_CPP=/usr/ccs/lib/cpp
+ RANLIB="ar -ts"
+ ;;
*-sunos5* | *-solaris* )
- opsys=sol2-5
+ opsys=sol2-6
NON_GNU_CPP=/usr/ccs/lib/cpp
;;
* ) opsys=bsd4-2 ;;
CPP="cc -E -traditional-cpp"
;;
+ ## AMD x86-64 Linux-based GNU system
+ x86_64-*-linux-gnu* )
+ machine=amdx86-64 opsys=gnu-linux
+ ;;
+
* )
unported=yes
;;
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
AC_MSG_RESULT($HAVE_XFREE386)
-# Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
-# for the tests that follow. We set it back to REAL_CFLAGS later on.
+# Change CFLAGS and CPPFLAGS temporarily so that C_SWITCH_X_SITE gets
+# used for the tests that follow. We set them back to REAL_CFLAGS and
+# REAL_CPPFLAGS later on.
REAL_CPPFLAGS="$CPPFLAGS"
fi
if test "${USE_X_TOOLKIT}" = "MOTIF"; then
+ AC_CACHE_CHECK(for LessTif where some systems put it, emacs_cv_lesstif,
+ # We put this in CFLAGS temporarily to precede other -I options
+ # that might be in CFLAGS temporarily.
+ # We put this in CPPFLAGS where it precedes the other -I options.
+ OLD_CPPFLAGS=$CPPFLAGS
+ OLD_CFLAGS=$CFLAGS
+ CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
+ CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS"
+ [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
+ # Make sure this -I option remains in CPPFLAGS after it is set
+ # back to REAL_CPPFLAGS.
+ # There is no need to change REAL_CFLAGS, because REAL_CFLAGS does not
+ # have those other -I options anyway. Ultimately, having this
+ # directory ultimately in CPPFLAGS will be enough.
+ REAL_CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $REAL_CPPFLAGS"
+ LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS"
+ else
+ CFLAGS=$OLD_CFLAGS
+ CPPFLAGS=$OLD_CPPFLAGS
+ 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}"