* configure.ac: Explicitly check for EMACS since AM_PATH_LISPDIR

does not do it if --with-lispdir is given.

diff --git a/ChangeLog b/ChangeLog
index 9017377149451637dae6235506266e89e4b72b4d..1da4eb52ed06306eda7bb50bf92f2b18d0e8d7be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-11  Andreas Schwab  <schwab@suse.de>
+
+       * configure.ac: Explicitly check for EMACS since AM_PATH_LISPDIR
+       does not do it if --with-lispdir is given.
+
 2002-03-08  Akim Demaille  <akim@epita.fr>
 
        Version 2.53.

diff --git a/configure.ac b/configure.ac
index eff14beb7cb102495ed45334f123daa041771724..62cccbe69f2cdce0bf20382c95ebbb61c12bf831 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,8 @@ $PERL -e 'require 5.005_03;' || {
 
 # Emacs modes.
 AC_CONFIG_FILES([lib/emacs/Makefile])
+test x"$EMACS" = xt && EMACS=
+AC_CHECK_PROGS(EMACS, emacs xemacs, no)
 AM_PATH_LISPDIR
 
 AC_CONFIG_FILES([Makefile doc/Makefile