From: Andrea Corallo <akrl@sdf.org>
Date: Sun, 21 Feb 2021 21:08:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'savannah/master' into HEAD
X-Git-Tag: emacs-28.0.90~2727^2~137
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf1e8e792f60949e09e3ad4c53fb61b0b7628229;p=emacs.git

Merge remote-tracking branch 'savannah/master' into HEAD
---

cf1e8e792f60949e09e3ad4c53fb61b0b7628229
diff --cc test/Makefile.in
index 3b6c18d9410,48bbe8712b4..c7501fa358b
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@@ -70,8 -70,16 +70,17 @@@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@
  am__v_at_0 = @
  am__v_at_1 =
  
 +HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@
  
+ # Load any GNU ELPA dependencies that are present, for optional tests.
+ GNU_ELPA_DIRECTORY ?= $(srcdir)/../../elpa
+ # Keep elpa_dependencies dependency-ordered.
+ elpa_dependencies = \
+ 	url-http-ntlm/url-http-ntlm.el \
+ 	web-server/web-server.el
+ elpa_els = $(addprefix $(GNU_ELPA_DIRECTORY)/packages/,$(elpa_dependencies))
+ elpa_opts = $(foreach el,$(elpa_els),$(and $(wildcard $(el)),-L $(dir $(el)) -l $(el)))
+ 
  # We never change directory before running Emacs, so a relative file
  # name is fine, and makes life easier.  If we need to change
  # directory, we can use emacs --chdir.