Re: Bootstrap broken between 2893cb6a21af3384cf5d6dc2b6bbdd5ebba8e1ad and 469fe6a040d6df612c00ea169670c6d8d7e58563

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

> Maybe we should add rmail-loaddefs to the value of LOADDEFS in
> lisp/Makefile.in?  Would someone who sees the problem please try that
> and report back?

I tried the following (by cargo culting the mh-e autoload stuff), but
the build still fails (if I put the (require 'url) back into
multisession.el).

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index df9e5c36ee..286506c4e2 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -66,6 +66,7 @@ LOADDEFS =
        $(lisp)/calendar/diary-loaddefs.el \
        $(lisp)/calendar/hol-loaddefs.el \
        $(lisp)/mh-e/mh-loaddefs.el \
+       $(lisp)/rmail/rmail-loaddefs.el \
        $(lisp)/net/tramp-loaddefs.el
 
 # All generated autoload files.
@@ -453,6 +454,19 @@ $(MH_E_DIR)/mh-loaddefs.el:
           --eval "(setq generated-autoload-file (expand-file-name 
(unmsys--file-name \"$@\")))" \
           -f batch-update-autoloads $(MH_E_DIR)
 
+# Update RMAIL internal autoloads. These are not to be confused with
+# the autoloads for the RMAIL entry points, which are already in loaddefs.el.
+RMAIL_DIR = $(lisp)/rmail
+RMAIL_SRC = $(sort $(wildcard ${RMAIL_DIR}/rmail*.el))
+RMAIL_SRC := $(filter-out ${RMAIL_DIR}/rmail-loaddefs.el,${RMAIL_SRC})
+
+.PHONY: rmail-autoloads
+rmail-autoloads: $(RMAIL_DIR)/rmail-loaddefs.el
+$(RMAIL_DIR)/rmail-loaddefs.el: $(RMAIL_SRC)
+       $(AM_V_GEN)$(emacs) -l autoload \
+          --eval "(setq generated-autoload-file (expand-file-name 
(unmsys--file-name \"$@\")))" \
+          -f batch-update-autoloads $(RMAIL_DIR)
+
 # Update TRAMP internal autoloads. Maybe we could move tramp*.el into
 # an own subdirectory. OTOH, it does not hurt to keep them in
 # lisp/net.


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no