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.
--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
;;
## 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
[ -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 select mktime)
+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}\"")
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'