[Xen-devel] [PATCH 1/3] tools: Once again honour GIT_HTTP env var

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

In "build: add autoconf to replace custom checks in tools/check"
--enable-githttp was introduced.  But that had the effect of
uncondtionally setting GIT_HTTP from the configure variable.

But the env var is advertised in some places as the way to specify
this behaviour, and overriding it is just unfriendly.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CC: Paul Durrant <paul.durrant@xxxxxxxxxx>
CC: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 config/Tools.mk.in    | 2 +-
 config/Toplevel.mk.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 1e5cc20bf7..d5985c0d09 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -41,7 +41,7 @@ XEN_TOOLS_RPATH     := @rpath@
 # GIT's protocol is faster and more robust, when it works at all (firewalls
 # may block it). We make it the default, but if your GIT repository downloads
 # fail or hang, please specify GIT_HTTP=y in your environment.
-GIT_HTTP            := @githttp@
+GIT_HTTP            ?= @githttp@
 
 # Optional components
 XENSTAT_XENTOP      := @monitors@
diff --git a/config/Toplevel.mk.in b/config/Toplevel.mk.in
index 1d991895ea..4ecacbb37d 100644
--- a/config/Toplevel.mk.in
+++ b/config/Toplevel.mk.in
@@ -1,2 +1,2 @@
 SUBSYSTEMS               := @SUBSYSTEMS@
-GIT_HTTP                 := @githttp@
+GIT_HTTP                 ?= @githttp@
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel