etcdir='${datadir}/${PROGNAME}-${version}/etc'
lockdir='${statedir}/${PROGNAME}/lock'
archlibdir='${datadir}/${PROGNAME}-${version}/${configuration}'
-docdir='${archlibdir}'
with_site_lisp='no'
with_site_modules='yes'
with_menubars=''
with_jpeg | \
with_png | \
with_tiff | \
- with_wmcommand | \
+ with_session | \
with_xmu | \
with_purify | \
with_quantify | \
malloc ) error_check_malloc=yes ;;
nomalloc ) error_check_malloc=no ;;
- byte_code ) error_check_byte_code=yes ;;
- nobyte_code ) error_check_byte_code=no ;;
-
* ) bogus_error_check=yes ;;
esac
if test "$bogus_error_check" -o \
\( -n "$new_default" -a -n "$echeck_notfirst" \) ; then
if test "$error_check_default" = yes ; then
- types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', \`nomalloc', and \`nobyte-code'."
+ types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', and \`nomalloc'."
else
- types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', \`malloc', and \`byte-code'."
+ types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', and \`malloc'."
fi
USAGE_ERROR(["Valid types for the \`--$optname' option are:
$types."])
error_check_bufpos=$new_default
error_check_gc=$new_default
error_check_malloc=$new_default
- error_check_byte_code=$new_default
new_default= # reset this
fi
echeck_notfirst=true
dnl You need to synchronize this with the way the
dnl default values are built.
case "$opt" in
- prefix ) AC_DEFINE(PREFIX_USER_DEFINED) ;;
- exec_prefix ) AC_DEFINE(EXEC_PREFIX_USER_DEFINED) ;;
lispdir ) AC_DEFINE(LISPDIR_USER_DEFINED) ;;
sitelispdir ) AC_DEFINE(SITELISPDIR_USER_DEFINED) ;;
moduledir ) AC_DEFINE(MODULEDIR_USER_DEFINED) ;;
AC_DEFINE(MODULEDIR_USER_DEFINED)
AC_DEFINE(ETCDIR_USER_DEFINED) ;;
statedir | lockdir ) AC_DEFINE(LOCKDIR_USER_DEFINED) ;;
- docdir ) AC_DEFINE(DOCDIR_USER_DEFINED) ;;
exec_prefix | libdir | archlibdir ) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;;
esac
;;
dnl ----------------------------------------
. "$srcdir/version.sh" || exit 1;
dnl Must do the following first to determine verbosity for AC_DEFINE
-if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
+if test -n "$emacs_beta_version"; then beta=yes; else beta=no; fi
: "${extra_verbose=$beta}"
version="${emacs_major_version}.${emacs_minor_version}"
AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version)
AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version)
-if test -n "$emacs_beta_version" ; then
- if test "$beta" = "yes"; then
- version="${version}-b${emacs_beta_version}"
- AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version)
- else
- version="${version}.${emacs_beta_version}"
- AC_DEFINE_UNQUOTED(EMACS_PATCH_LEVEL, $emacs_beta_version)
- fi
+if test -n "$emacs_beta_version"; then
+ version="${version}-b${emacs_beta_version}"
+ AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version)
fi
AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename")
AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
dnl ----------------------------------
dnl Error checking default to "yes" in beta versions, to "no" in releases.
dnl Same goes for --debug and --extra-verbosity.
-if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
+if test -n "$emacs_beta_version"; then beta=yes; else beta=no; fi
test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
test "${error_check_typecheck=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPECHECK)
test "${error_check_bufpos=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BUFPOS)
test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC)
test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
-test "${error_check_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE)
dnl debug=yes must be set when error checking is present. This should be
dnl fixed up.
dnl debug implies other options
COLON_TO_SPACE(site_prefixes)
if test -n "$site_prefixes"; then
for dir in $site_prefixes; do
- lib_dir="${dir}/lib"
inc_dir="${dir}/include"
+ lib_dir="${dir}/lib"
if test ! -d "$dir"; then
XE_DIE("Invalid site prefix \`$dir': no such directory")
+ elif test ! -d "$inc_dir"; then
+ XE_DIE("Invalid site prefix \`$dir': no such directory \`$inc_dir'")
elif test ! -d "$lib_dir"; then
XE_DIE("Invalid site prefix \`$dir': no such directory \`$lib_dir'")
else
- if test -d "$inc_dir"; then
- XE_APPEND("-I$inc_dir", c_switch_site)
- fi
+ XE_APPEND("-I$inc_dir", c_switch_site)
XE_APPEND("-L$lib_dir", ld_switch_site)
fi
done
dnl if test "$with_tty" = "no" ; then
dnl AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.])
dnl fi
- for feature in tooltalk cde offix wmcommand xim xmu
+ for feature in tooltalk cde offix session xim xmu
do
if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
AC_MSG_WARN([--with-$feature ignored: Not valid without X support])
test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
esac
-dnl Enable or disable proper handling of WM_COMMAND
-AC_CHECKING(for WM_COMMAND option);
-dnl if test "$with_wmcommand" = "yes"; then
-if test "$with_wmcommand" != "no"; then
- AC_DEFINE(HAVE_WMCOMMAND)
+dnl Enable or disable proper session-management
+AC_CHECKING(for session-management option);
+dnl if test "$with_session" = "yes"; then
+if test "$with_session" != "no"; then
+ AC_DEFINE(HAVE_SESSION)
fi
dnl Autodetect Xauth
test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) }
test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) }
if test "$with_ldap" != "no"; then
- AC_CHECK_LIB(ldap, ldap_search, with_ldap_nolber=yes, with_ldap_nolber=no)
- test "$with_ldap_nolber" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_lber=yes, with_ldap_lber=no, -llber) }
- test -z "$with_ldap" -a \( "$with_ldap_lber" = "yes" -o "$with_ldap_nolber" = "yes" \) && with_ldap=yes
+ test -z "$with_umich_ldap" && { AC_CHECK_LIB(ldap, ldap_open, with_umich_ldap=yes, with_umich_ldap=no, -llber) }
+ test "$with_umich_ldap" = "no" && { AC_CHECK_LIB(ldap10, ldap_set_option, with_ns_ldap=yes, with_ns_ldap=no) }
+ test -z "$with_ldap" -a \( "$with_umich_ldap" = "yes" -o "$with_ns_ldap" = "yes" \) && with_ldap=yes
fi
if test "$with_ldap" = "yes"; then
AC_DEFINE(HAVE_LDAP)
XE_ADD_OBJS(eldap.o)
- if test "$with_ldap_nolber" = "yes" ; then
- XE_PREPEND(-lldap, LIBS)
- else
+ if test "$with_umich_ldap" = "yes" ; then
+ AC_DEFINE(HAVE_UMICH_LDAP)
XE_PREPEND(-llber, LIBS)
XE_PREPEND(-lldap, LIBS)
+ elif test "$with_ldap" = "yes" -a "$with_ns_ldap" = "yes" ; then
+ AC_DEFINE(HAVE_NS_LDAP)
+ XE_PREPEND(-lldap10, LIBS)
+ elif test "$with_ldap" = "yes" ; then
+ XE_PREPEND(-lldap, LIBS)
fi
- AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
fi
dnl ----------------------
AC_SUBST(mandir)
AC_SUBST(prefix)
-AC_SUBST(PREFIX_USER_DEFINED)
dnl Yo, Stephen Bourne! I want to marry you!
PREFIX=$prefix
while true; do
AC_SUBST(PREFIX)
AC_SUBST(exec_prefix)
-AC_SUBST(EXEC_PREFIX_USER_DEFINED)
EXEC_PREFIX=$exec_prefix
while true; do
case "$EXEC_PREFIX" in
done
AC_SUBST(LOCKDIR)
-AC_SUBST(docdir)
-AC_SUBST(DOCDIR_USER_DEFINED)
-DOCDIR=$docdir
-while true; do
- case "$DOCDIR" in
- *\$* ) eval "DOCDIR=$DOCDIR" ;;
- *) break ;;
- esac
-done
-AC_SUBST(DOCDIR)
-
AC_SUBST(archlibdir)
AC_SUBST(ARCHLIBDIR_USER_DEFINED)
ARCHLIBDIR=$archlibdir
echo "$0 $quoted_arguments"
) > Installation
-if test ! -z ${emacs_beta_version} ; then
- if test -z "${emacs_is_beta}" ; then
- xemacs_betaname=".${emacs_beta_version}"
- else
- xemacs_betaname="-b${emacs_beta_version}"
- fi
-else
- xemacs_betaname=""
-fi
+xemacs_betaname=""
+test ! -z "${emacs_beta_version}" && xemacs_betaname="-b${emacs_beta_version}"
dnl Start stdout redirection to '| tee -a Installation'
(
test "$with_database_dbm" = yes && echo " Compiling in support for DBM."
test "$with_database_gnudbm" = yes && echo " Compiling in support for GNU DBM."
-test "$with_ldap" = yes && echo " Compiling in support for LDAP."
+test "$with_umich_ldap" = yes && echo " Compiling in support for LDAP (UMich libs)."
+test "$with_ns_ldap" = yes && echo " Compiling in support for LDAP (Netscape SDK)."
+test "$with_ldap" = yes -a "$with_umich_ldap" = no -a "$with_ns_ldap" = no && echo " Compiling in support for LDAP (Generic)."
test "$with_ncurses" = yes && echo " Compiling in support for ncurses."
test "$with_gpm" = yes && echo " Compiling in support for GPM (General Purpose Mouse)."
test "$with_offix" = yes && echo " Compiling in support for OffiX."
test "$with_dragndrop" = yes && echo " Compiling in EXPERIMENTAL support for Drag'n'Drop ($dragndrop_proto )."
test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop."
-test "$with_wmcommand" != no && echo " Compiling in support for proper WM_COMMAND handling."
+test "$with_session" != no && echo " Compiling in support for proper session-management."
case "$with_menubars" in
lucid ) echo " Using Lucid menubars." ;;
motif ) echo " Using Motif menubars."