* m4/lispdir.m4 (AM_PATH_LISPDIR): If EMACS=t, empty it before

running AC_CHECK_PROGS(EMACS).
* lib/am/lisp.am (elc-stamp): Quote $(EMACS).
Report from Jens Petersen.

diff --git a/ChangeLog b/ChangeLog
index 86950695967d80dd54c50c252ebdf62e879cfe66..e759a0d99aa341f1a1e7b7982fc49184df99c2eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-11-13  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): If EMACS=t, empty it before
+       running AC_CHECK_PROGS(EMACS).
+       * lib/am/lisp.am (elc-stamp): Quote $(EMACS).
+       Report from Jens Petersen.
+
        * tests/mkinst2.test: Rewrite.
 
        * m4/mkdirp.m4: Do not require AM_AUX_DIR_EXPAND.

diff --git a/THANKS b/THANKS
index b08b93efc4d7ed29b058e645a853d150518bb196..89625d1818ac90d5f42bf7878a04a4a543a41fa3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -95,6 +95,7 @@ Jeff Garzik           jgarzik@pobox.com
 Jeff Squyres           jsquyres@lam-mpi.org
 Jens Elkner            elkner@imsgroup.de
 Jens Krüger            jens_krueger@physik.tu-muenchen.de
+Jens Petersen          petersen@redhat.com
 Jeremy Nimmer          jwnimmer@alum.mit.edu
 Jerome Lovy            jlovy@multimania.com
 Jerome Santini         santini@chambord.univ-orleans.fr

diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index ed6ad40dcc179e29d34bb973b0d07aade7892ed3..2e754f4c3e7376a6d2ba546f831740a4030999b2 100644 (file)
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -24,7 +24,7 @@
 
 elc-stamp: $(am__ELFILES)
        @echo 'WARNING: Warnings can be ignored. :-)'
-       if test $(EMACS) != no; then \
+       if test "$(EMACS)" != no; then \
 ## Make sure "$@" isn't empty initially.
          set x; \
 ## Populate "$@" with elisp files (found in the current directory
@@ -35,7 +35,7 @@ elc-stamp: $(am__ELFILES)
          done; \
 ## Finally call elisp-comp for all files.
          shift; \
-         EMACS=$(EMACS) $(SHELL) $(elisp_comp) "$$@" || exit 1; \
+         EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \
        else : ; fi
        touch $@
 

diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 74aac3cb9dbe0b39386dffe288db5e35e438a238..062b49e6e29a334ac3212c55dd0050fee1a9f84c 100644 (file)
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -27,7 +27,10 @@
 # AM_PATH_LISPDIR
 # ---------------
 AC_DEFUN([AM_PATH_LISPDIR],
-[AC_CHECK_PROGS([EMACS], [emacs xemacs], [no])
+[ # If set to t, that means we are running in a shell under Emacs.
+ # If you have an Emacs named "t", then use the full path.
+ test x"$EMACS" = xt && EMACS=
+ AC_CHECK_PROGS([EMACS], [emacs xemacs], [no])
  AC_ARG_VAR([EMACS], [the Emacs editor command])
  AC_ARG_VAR([EMACSLOADPATH], [the Emacs library search path])
  AC_ARG_WITH([lispdir],
@@ -36,9 +39,6 @@ AC_DEFUN([AM_PATH_LISPDIR],
    AC_MSG_CHECKING([where .elc files should go])
    AC_MSG_RESULT([$lispdir])],
  [
- # If set to t, that means we are running in a shell under Emacs.
- # If you have an Emacs named "t", then use the full path.
- test x"$EMACS" = xt && EMACS=
  AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], [
    if test $EMACS != "no"; then
      if test x${lispdir+set} != xset; then