unset EMACS_cv_SYS_flavor;
AC_EMACS_LISP(flavor,
- (cond ((featurep (quote xemacs)) \"XEmacs\")\
- ((boundp (quote MULE)) \"MULE\")\
- (t \"FSF Emacs\")),
+ (if (featurep (quote xemacs))\
+ \"XEmacs\"\
+ \"Emacs\"),
"noecho")
- case $EMACS_cv_SYS_flavor in
- XEmacs)
- EMACS_FLAVOR=xemacs;;
- MULE)
- EMACS_FLAVOR=mule;;
- *)
- EMACS_FLAVOR=emacs;;
- esac
+ if test $EMACS_cv_SYS_flavor = XEmacs; then
+ EMACS_FLAVOR=xemacs
+ else
+ EMACS_FLAVOR=emacs
+ fi
AC_MSG_RESULT($EMACS_cv_SYS_flavor)])
AC_DEFUN(AC_PATH_LISPDIR, [
AC_DEFUN(AC_EXAMINE_PACKAGEDIR,
[dnl Examine PACKAGEDIR.
AC_EMACS_LISP(PACKAGEDIR,
- (let (package-dir)\
- (if (boundp (quote early-packages))\
- (let ((dirs (delq nil (append (if early-package-load-path\
- early-packages)\
- (if late-package-load-path\
- late-packages)\
- (if last-package-load-path\
- last-packages)))))\
- (while (and dirs (not package-dir))\
- (if (file-directory-p (car dirs))\
- (setq package-dir (car dirs)\
- dirs (cdr dirs))))))\
+ (let ((dirs (append\
+ (if (and (boundp (quote configure-package-path))\
+ (listp configure-package-path))\
+ (delete \"\" configure-package-path))\
+ (if (boundp (quote early-packages))\
+ (append\
+ (if early-package-load-path early-packages)\
+ (if late-package-load-path late-packages)\
+ (if last-package-load-path last-packages)))))\
+ package-dir)\
+ (while (and dirs (not package-dir))\
+ (if (file-directory-p (car dirs))\
+ (setq package-dir (car dirs)\
+ dirs (cdr dirs))))\
(or package-dir \"\")),
"noecho")])