Re: automake-1.7b lisp3.test failure

[Alexandre Duret-Lutz]

>>> "Jens" == Jens Petersen <address@hidden> writes:

 Jens> I ran "make check VERBOSE=x" for 1.7b inside XEmacs
 Jens> compilation-mode yesterday with autoconf-2.58 installed (on
 Jens> a Fedora Core 1 box if it matters) and lisp3.test failed
 Jens> with the output below.  Looking at the definition of
 Jens> AM_PATH_LISPDIR (lispdir.m4) it seems
 Jens> AC_CHECK_PROGS([EMACS], [emacs xemacs], [no]) now occurs too
 Jens> early (ie before: test x"$EMACS" = xt && EMACS=) for the
 Jens> case one is inside emacs.

Good catch, thanks a lot!  I'm checking this in.

2003-11-13  Alexandre Duret-Lutz  <address@hidden>

        * 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.

Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.226
diff -u -r1.226 THANKS
--- THANKS      12 Nov 2003 19:29:53 -0000      1.226
+++ THANKS      13 Nov 2003 19:37:47 -0000
@@ -95,6 +95,7 @@
 Jeff Squyres           address@hidden
 Jens Elkner            address@hidden
 Jens Krüger            address@hidden
+Jens Petersen          address@hidden
 Jeremy Nimmer          address@hidden
 Jerome Lovy            address@hidden
 Jerome Santini         address@hidden
Index: lib/am/lisp.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/lisp.am,v
retrieving revision 1.38
diff -u -r1.38 lisp.am
--- lib/am/lisp.am      10 Nov 2003 20:55:32 -0000      1.38
+++ lib/am/lisp.am      13 Nov 2003 19:37:48 -0000
@@ -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 @@
          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 $@
 
Index: m4/lispdir.m4
===================================================================
RCS file: /cvs/automake/automake/m4/lispdir.m4,v
retrieving revision 1.22
diff -u -r1.22 lispdir.m4
--- m4/lispdir.m4       21 Oct 2003 16:29:03 -0000      1.22
+++ m4/lispdir.m4       13 Nov 2003 19:37:48 -0000
@@ -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_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

-- 
Alexandre Duret-Lutz