Re: py-compile-and-elisp-comp-in-auxdir.patch

[Alexandre Duret-Lutz]

>>> "Akim" == Akim Demaille <address@hidden> writes:

 >>>>>> "Alexandre" == Alexandre Duret-Lutz <address@hidden> writes:
 Alexandre> This is meant for branch-real-1-5 and HEAD.

 Akim> Please, install, I'm having the problem right now for CVS Autoconf :)

(I had to 'cvs up' Autoconf to see it was not a joke :)

I was about to commit this patch when I realized the elisp part
would just broke lisp.am ...  I had only tested the Python
part of the patch before submiting it, and made the elisp
part similary because I thought it worked likewise.  But I was
wrong: lisp.am assumes elisp-comp is in the curdir.

Here is an updated patch (looks like I'm making to much 'updated
patches' these days).  I tested the resulting Automake on CVS
Autoconf setup: it seems to work fine.

2001-09-29  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (handle_python): Use require_conf_file_with_conf_line
        instead of require_file_with_conf_line, so that elisp-comp and
        py-compile are installed in the aux-directory.
        (handle_emacs_lisp): Likewise.  Define elisp_comp.
        * lib/am/lisp.am (.el.elc): Use elisp_comp.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1170.2.2
diff -u -u -b -r1.1170.2.2 automake.in
--- automake.in 2001/08/28 03:52:33     1.1170.2.2
+++ automake.in 2001/09/29 18:29:47
@@ -4193,7 +4193,9 @@
     &am_error ("`lisp_LISP' defined but `AM_PATH_LISPDIR' not in 
`$configure_ac'")
       if ! $seen_lispdir && &variable_defined ('lisp_LISP');
 
-    &require_file_with_conf_line ('AM_PATH_LISPDIR', $FOREIGN, 'elisp-comp');
+    &require_conf_file_with_conf_line ('AM_PATH_LISPDIR',
+                                      $FOREIGN, 'elisp-comp');
+    &define_variable ('elisp_comp', $config_aux_dir . '/elisp-comp');
 }
 
 # Handle Python
@@ -4207,7 +4209,8 @@
     &am_error ("`python_PYTHON' defined but `AM_PATH_PYTHON' not in 
`$configure_ac'")
        if ! $seen_pythondir && &variable_defined ('python_PYTHON');
 
-    &require_file_with_conf_line ('AM_PATH_PYTHON', $FOREIGN, 'py-compile');
+    &require_conf_file_with_conf_line ('AM_PATH_PYTHON',
+                                      $FOREIGN, 'py-compile');
     &define_variable ('py_compile', $config_aux_dir . '/py-compile');
 }
 
Index: lib/am/lisp.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/lisp.am,v
retrieving revision 1.29
diff -u -u -b -r1.29 lisp.am
--- lisp.am     2001/07/16 16:19:38     1.29
+++ lisp.am     2001/09/29 18:29:47
@@ -27,7 +27,7 @@
 .el.elc:
        @echo 'WARNING: Warnings can be ignored. :-)'
        if test $(EMACS) != no; then \
-         EMACS=$(EMACS) $(SHELL) $(srcdir)/elisp-comp $<; \
+         EMACS=$(EMACS) $(SHELL) $(elisp_comp) $<; \
        else : ; fi
 
 ## ------------ ##
-- 
Alexandre Duret-Lutz