From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 13 Nov 2003 19:39:06 +0000 (+0000)
Subject: * m4/lispdir.m4 (AM_PATH_LISPDIR): If EMACS=t, empty it before
X-Git-Tag: Release-1-7d~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b86476fc7363ec1092b3db3a6f39b5d903a37f2;p=thirdparty%2Fautomake.git

* 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 869506959..e759a0d99 100644
--- 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 b08b93efc..89625d181 100644
--- 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 ed6ad40dc..2e754f4c3 100644
--- 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 74aac3cb9..062b49e6e 100644
--- 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