AC_CONFIG_HEADER(src/config.h:src/config.in)
lispdir='${datadir}/emacs/${version}/lisp'
-locallisppath='${datadir}/emacs/site-lisp'
+locallisppath='${datadir}/emacs/${version}/site-lisp:'\
+'${datadir}/emacs/site-lisp'
lisppath='${locallisppath}:${lispdir}'
etcdir='${datadir}/emacs/${version}/etc'
lockdir='${sharedstatedir}/emacs/lock'
m68*-altos-sysv* )
machine=altos opsys=usg5-2
;;
-
+
## Amdahl UTS
580-amdahl-sysv* )
machine=amdahl opsys=usg5-2-2
## Convex
*-convex-bsd* | *-convex-convexos* )
machine=convex opsys=bsd4-3
- ## Prevents suprious white space in makefiles - d.m.cooke@larc.nasa.gov
+ ## Prevents spurious white space in makefiles - d.m.cooke@larc.nasa.gov
NON_GNU_CPP="cc -E -P"
;;
if test -s /etc/167config
then CC="gnucc -m68040"
else CC="gnucc -m68881"
- fi
+ fi
else
if test -z "`type gcc | grep 'not found'`"
then CC=gcc
[56].[0-9] ) machine=nh4000 opsys=cxux ;;
[7].[0-9] ) machine=nh4000 opsys=cxux7 ;;
esac
+ NON_GNU_CPP="/lib/cpp"
;;
## Harris ecx or gcx running CX/UX (Series 1200, Series 3000)
m68k-harris-cxux* )
machine=nh3000 opsys=cxux
;;
+ ## Harris power pc NightHawk running Power UNIX (Series 6000)
+ powerpc-harris-powerunix )
+ machine=nh6000 opsys=powerunix
+ NON_GNU_CPP="cc -Xo -E -P"
+ ;;
## Honeywell XPS100
xps*-honeywell-sysv* )
*) machine=hp800 opsys=hpux ;;
esac
;;
+ hppa-*-nextstep* )
+ machine=hp800 opsys=nextstep
+ ;;
## Orion machines
orion-orion-bsd* )
;;
romp-ibm-bsd4.3* )
machine=ibmrt opsys=bsd4-3
- ;;
+ ;;
romp-ibm-bsd4.2* )
machine=ibmrt opsys=bsd4-2
;;
romp-ibm-aos4.3* )
machine=ibmrt opsys=bsd4-3
- ;;
+ ;;
romp-ibm-aos4.2* )
machine=ibmrt opsys=bsd4-2
;;
machine=iris4d opsys=irix4-0
;;
mips-sgi-irix6* )
- machine=iris4d opsys=irix6-0
+ machine=iris4d opsys=irix6-0 NON_GNU_CPP=/lib/cpp
;;
mips-sgi-irix5.[01]* )
machine=iris4d opsys=irix5-0
opsys=sunos4shr
NON_GNU_CPP=/usr/lib/cpp
;;
- *-sunos4* | *-sunos ) opsys=sunos4-1
+ *-sunos4.1.[3-9]*-noshare )
+ opsys=sunos4-1-3
+ NON_GNU_CPP=/usr/lib/cpp
+ NON_GCC_TEST_OPTIONS=-Bstatic
+ GCC_TEST_OPTIONS=-static
+ ;;
+ *-sunos4* | *-sunos )
+ opsys=sunos4-1
NON_GCC_TEST_OPTIONS=-Bstatic
GCC_TEST_OPTIONS=-static
;;
RANLIB="ar -ts"
;;
*-sunos5* | *-solaris* )
- opsys=sol2
+ opsys=sol2-4
NON_GNU_CPP=/usr/ccs/lib/cpp
;;
* ) opsys=bsd4-2 ;;
titan-titan-sysv* )
machine=titan opsys=usg5-3
;;
-
+
## Ustation E30 (SS5E)
m68*-unisys-uniplus* )
machine=ustation opsystem=unipl5-2
if test x$GCC = xyes && test "x$GCC_TEST_OPTIONS" != x
then
CC="$CC $GCC_TEST_OPTIONS"
-fi
+fi
if test x$GCC = x && test "x$NON_GCC_TEST_OPTIONS" != x
then
CC="$CC $NON_GCC_TEST_OPTIONS"
-fi
+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
if test x"${x_includes}" = x; then
bitmapdir=/usr/include/X11/bitmaps
else
- # accumulate include directories that have X11 bitmap sudirectories
+ # accumulate include directories that have X11 bitmap subdirectories
bmd_acc="dummyval"
for bmd in `echo ${x_includes} | sed -e "s/:/ /g"`; do
if test -d "${bmd}/X11/bitmaps"; then
HAVE_X_WINDOWS=yes
HAVE_X11=yes
case "${with_x_toolkit}" in
- athena | lucid ) USE_X_TOOLKIT=LUCID ;;
- motif ) USE_X_TOOLKIT=MOTIF ;;
-dnl open-look ) USE_X_TOOLKIT=OPEN_LOOK ;;
- * ) USE_X_TOOLKIT=none ;;
+ athena | lucid ) USE_X_TOOLKIT=LUCID ;;
+ motif ) USE_X_TOOLKIT=MOTIF ;;
+dnl open-look ) USE_X_TOOLKIT=OPEN_LOOK ;;
+ no ) USE_X_TOOLKIT=none ;;
+dnl If user did not say whether to use a toolkit,
+dnl make this decision later: use the toolkit if we have X11R5 or newer.
+ * ) USE_X_TOOLKIT=maybe ;;
esac
;;
none )
USE_X_TOOLKIT=none
;;
esac
-X_TOOLKIT_TYPE=$USE_X_TOOLKIT
### If we're using X11, we should use the X menu package.
-HAVE_X_MENU=no
+HAVE_MENUS=no
case ${HAVE_X11} in
- yes ) HAVE_X_MENU=yes ;;
+ yes ) HAVE_MENUS=yes ;;
esac
if test "${opsys}" = "hpux9"; then
AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
XScreenNumberOfScreen XSetWMProtocols)
+ AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
+fi
+
+if test "${window_system}" = "x11"; then
+ AC_MSG_CHECKING(X11 version 6)
+ AC_TRY_LINK([#include <X11/Xlib.h>],
+[#if XlibSpecificationRelease < 6
+fail;
+#endif
+], [AC_MSG_RESULT(6)
+ AC_DEFINE(HAVE_X11R6)],
+ [AC_MSG_RESULT(not 6)])
fi
+if test x"${USE_X_TOOLKIT}" = xmaybe; then
+ AC_MSG_CHECKING(X11 version 5)
+ AC_TRY_LINK([#include <X11/Xlib.h>],
+[#if XlibSpecificationRelease < 5
+fail;
+#endif
+], [AC_MSG_RESULT(5, use toolkit)
+ USE_X_TOOLKIT=LUCID
+ AC_DEFINE(HAVE_X11R5)],
+ [AC_MSG_RESULT(not 5, do not use toolkit)
+ USE_X_TOOLKIT=none])
+ fi
+fi
+
+X_TOOLKIT_TYPE=$USE_X_TOOLKIT
+
if test "${USE_X_TOOLKIT}" != "none"; then
AC_MSG_CHECKING(X11 toolkit version)
AC_TRY_LINK([#include <X11/Intrinsic.h>],
AC_DEFINE(LOCALTIME_CACHE)
fi
-if test $HAVE_TIMEVAL = yes; then
+if test "x$HAVE_TIMEVAL" = xyes; then
AC_MSG_CHECKING(whether gettimeofday can't accept two arguments)
AC_TRY_LINK([
#ifdef TIME_WITH_SYS_TIME
if test "${HAVE_XFREE386}" = "yes" ; then
AC_DEFINE(HAVE_XFREE386)
fi
-if test "${HAVE_X_MENU}" = "yes" ; then
- AC_DEFINE(HAVE_X_MENU)
+if test "${HAVE_MENUS}" = "yes" ; then
+ AC_DEFINE(HAVE_MENUS)
fi
if test "${GNU_MALLOC}" = "yes" ; then
AC_DEFINE(GNU_MALLOC)