prefix='/usr/local'
exec_prefix='${prefix}'
bindir='${exec_prefix}/bin'
-datadir='${prefix}/lib'
-statedir='${prefix}/lib'
-libdir='${exec_prefix}/lib'
+datadir='${prefix}/share'
+sharedstatedir='${prefix}/com'
+libexecdir='${exec_prefix}/libexec'
mandir='${prefix}/man/man1'
infodir='${prefix}/info'
lispdir='${datadir}/emacs/${version}/lisp'
locallisppath='${datadir}/emacs/site-lisp'
lisppath='${locallisppath}:${lispdir}'
etcdir='${datadir}/emacs/${version}/etc'
-lockdir='${statedir}/emacs/lock'
-archlibdir='${libdir}/emacs/${version}/${configuration}'
+lockdir='${sharedstatedir}/emacs/lock'
+archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
# On Sun systems, people sometimes set up the variable CPP
# We cannot use this variable in the case statement below, because many
# /bin/sh's have broken semantics for "case". Unfortunately, you must
# actually edit the clause itself.
-# path_options="prefix | exec_prefix | bindir | libdir | etcdir | datadir"
-# path_options="$path_options | archlibdir | statedir | mandir | infodir"
+# path_options="prefix | exec_prefix | bindir | libexecdir | etcdir | datadir"
+# path_options="$path_options | archlibdir | sharedstatedir | mandir | infodir"
# path_options="$path_options | lispdir | lockdir | lisppath | locallisppath"
#### Usage messages.
CONFIGURATION specifies the machine and operating system to build for.
--with-x Support the X Window System.
--with-x=no Don't support X.
---with-x-toolkit Use an X toolkit.
+--with-x-toolkit=yes Use the X toolkit. Default to Lucid/Athena widgets.
+--with-x-toolkit=athena Use the X toolkit with Athena widgets.
+--with-x-toolkit=lucid Use the X toolkit with Lucid widgets.
+--with-x-toolkit=motif Use the X toolkit with Motif widgets.
--with-x-toolkit=no Don't use an X toolkit.
--with-gcc Use GCC to compile Emacs.
--with-gcc=no Don't use GCC to compile Emacs.
--prefix=DIR Install files below DIR. Defaults to \`${prefix}'.
You may also specify any of the \`path' variables found in Makefile.in,
-including --bindir, --libdir, --etcdir, --infodir, and so on. This allows
+including --bindir, --libexecdir, --etcdir, --infodir, and so on. This allows
you to override a single default location when configuring.
If successful, ${progname} leaves its status in config.status. If
### However, it also turns out that many shells cannot expand ${10} at all.
### So using an index variable doesn't work either. It is possible to use
### some shell magic to make 'set x "$arguments"; shift' work portably.
+config_options="$*"
while [ $# != 0 ]; do
arg="$1"; shift
case "${arg}" in
## If FOO is a boolean argument, --FOO is equivalent to
## --FOO=yes. Otherwise, the value comes from the next
## argument - see below.
- opt=`echo ${arg} | sed 's:^-*\(.*\)$:\1:'`
+ opt=`echo ${arg} | sed 's:^-*::'`
val="yes"
valomitted=yes
;;
n | no ) val=no ;;
l | lu | luc | luci | lucid ) val=lucid ;;
a | at | ath | athe | athena ) val=athena ;;
+ m | mo | mot | moti | motif ) val=motif ;;
# These don't currently work.
-# m | mo | mot | moti | motif ) val=motif ;;
# o | op | ope | open | open- | open-l | open-lo \
# | open-loo | open-look ) val=open-look ;;
* )
#echo "${progname}: the \`--${optname}' option is supposed to have a value
#which is \`yes', \`no', \`lucid', \`athena', \`motif' or \`open-look'."
echo "${progname}: the \`--${optname}' option is supposed to have a value
-which is \`yes', \`no', \`lucid', or \`athena'.
+which is \`yes', \`no', \`lucid', \`athena', or \`motif'.
Currently, \`yes', \`athena' and \`lucid' are synonyms."
echo "${short_usage}") >&2
exit 1
;;
## Has the user specified one of the path options?
- prefix | exec_prefix | bindir | libdir | etcdir | datadir | \
- archlibdir | statedir | mandir | infodir | lispdir | lockdir | \
+ prefix | exec_prefix | bindir | libexecdir | etcdir | datadir | \
+ archlibdir | sharedstatedir | mandir | infodir | lispdir | lockdir | \
lisppath | locallisppath | docdir )
## If the value was omitted, get it from the next argument.
if [ "${valomitted}" = "yes" ]; then
* ) srcdir="`(cd ${srcdir}; pwd)`" ;;
esac
+### Remove trailing slashes.
+srcdir=`echo "${srcdir}" | sed 's,\([^/]\)/*$,\1,'`
+
#### Check if the source directory already has a configured system in it.
if [ `pwd` != `(cd ${srcdir} && pwd)` ] \
&& [ -f "${srcdir}/src/config.h" ] ; then
esac
;;
+ ## Acorn RISCiX:
+ arm-acorn-riscix1.1* )
+ machine=acorn opsys=riscix1-1
+ ;;
+ arm-acorn-riscix1.2* | arm-acorn-riscix )
+ machine=acorn opsys=riscix1-2
+ ;;
+
## Alliant machines
## Strictly speaking, we need the version of the alliant operating
## system to choose the right machine file, but currently the
machine=i386 opsys=usg5-3
;;
- ## Sequent Symmetry
+ ## Sequent Symmetry running Dynix
i[345]86-sequent-bsd* )
machine=symmetry opsys=bsd4-3
;;
+ ## Sequent Symmetry running DYNIX/ptx
+ ## Use the old cpp rather than the newer ANSI one.
+ i[345]86-sequent-ptx* )
+ machine=sequent-ptx opsys=ptx
+ NON_GNU_CPP="/lib/cpp"
+ ;;
+
## Unspecified sysv on an ncr machine defaults to svr4.2.
## (Plain usg5-4 doesn't turn on POSIX signals, which we need.)
i[345]86-ncr-sysv* )
AC_PROG_YACC
dnl checks for UNIX variants that set `DEFS'
+AC_AIX
dnl checks for header files
-AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h)
+AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h utime.h)
AC_STDC_HEADERS
AC_TIME_WITH_SYS_TIME
dnl In Autoconf 1.8 use AC_SYS_SIGLIST_DECLARED instead of this.
#include <unistd.h>
#endif], [char *msg = *(sys_siglist + 1);],
AC_DEFINE(SYS_SIGLIST_DECLARED))
+dnl Some systems have utime.h but don't declare the struct anyplace.
+AC_COMPILE_CHECK(struct utimbuf, [#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#endif], [static struct utimbuf x; x.actime = x.modtime;],
+ AC_DEFINE(HAVE_STRUCT_UTIMBUF))
dnl checks for typedefs
AC_RETSIGTYPE
+AC_COMPILE_CHECK(struct timeval, [#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif], [static struct timeval x; x.tv_sec = x.tv_usec;],
+ AC_DEFINE(HAVE_TIMEVAL))
dnl checks for structure members
AC_STRUCT_TM
[ -n "${x_libraries}" ] && LD_SWITCH_X_SITE_AUX="-R${x_libraries}"
[ -n "${x_includes}" ] && C_SWITCH_X_SITE="-I${x_includes}"
+if [ x"${x_includes}" = x ]; then
+ bitmapdir=/usr/include/X11/bitmaps;
+else
+ bitmapdir="${x_includes}/bitmaps";
+fi
+
# Avoid forcing the search of /usr/include before fixed include files.
if [ "$C_SWITCH_X_SITE" = "-I/usr/include" ]; then
C_SWITCH_X_SITE=" "
AC_HAVE_LIBRARY(-lm)
AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \
random lrand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid \
-strerror fpathconf)
+strerror fpathconf select mktime eaccess getpagesize)
ok_so_far=true
AC_FUNC_CHECK(socket, , ok_so_far=)
]
AC_SUBST(version)
AC_SUBST(configuration)
+AC_SUBST(canonical)
AC_SUBST(srcdir)
AC_SUBST(prefix)
AC_SUBST(exec_prefix)
AC_SUBST(bindir)
AC_SUBST(datadir)
-AC_SUBST(statedir)
-AC_SUBST(libdir)
+AC_SUBST(sharedstatedir)
+AC_SUBST(libexecdir)
AC_SUBST(mandir)
AC_SUBST(infodir)
AC_SUBST(lispdir)
AC_SUBST(lockdir)
AC_SUBST(archlibdir)
AC_SUBST(docdir)
+AC_SUBST(bitmapdir)
AC_SUBST(c_switch_system)
AC_SUBST(c_switch_machine)
AC_SUBST(LD_SWITCH_X_SITE)
AC_SUBST(machfile)
AC_SUBST(opsysfile)
-AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "\"${configuration}\"")
+AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "\"${canonical}\"")
+AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "\"${config_options}\"")
AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"")
AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
if [ "$datadir_specified" = "" ]; then
datadir='${prefix}/common'
fi
- if [ "$statedir_specified" = "" ]; then
- statedir='${prefix}/common'
+ if [ "$sharedstatedir_specified" = "" ]; then
+ sharedstatedir='${prefix}/common'
fi
- if [ "$libdir_specified" = "" ]; then
- libdir='${bindir}'
+ if [ "$libexecdir_specified" = "" ]; then
+ libexecdir='${bindir}'
fi
if [ "$lispdir_specified" = "" ]; then
lispdir='${prefix}/common/lisp'
lockdir='${prefix}/common/lock'
fi
if [ "$archlibdir_specified" = "" ]; then
- archlibdir='${libdir}/etc'
+ archlibdir='${libexecdir}/etc'
fi
if [ "$etcdir_specified" = "" ]; then
etcdir='${prefix}/common/data'
HCoop / bpt / emacs.git / blobdiff