tools: Once again honour, but no longer advertise GIT_HTTP env var

In "build: add autoconf to replace custom checks in tools/check"
--enable-githttp was introduced.  But we missed this comment where it
was advertised.

Also, that commit had the effect of uncondtionally setting GIT_HTTP
from the configure variable.  But the env var has been advertised in
some places as the way to specify this behaviour, and overriding it is
just unfriendly.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Paul Durrant <paul.durrant@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 1e5cc20bf79c4ce8e4d47bd0e269b8d8d33b8486..98245f63c90c2bc0d09836b6389d3a82de4ded7a 100644 (file)
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -40,8 +40,8 @@ XEN_TOOLS_RPATH     := @rpath@
 # Download GIT repositories via HTTP or GIT's own protocol?
 # 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@
+# fail or hang, please pass --enable-githttp to configure.
+GIT_HTTP            ?= @githttp@
 
 # Optional components
 XENSTAT_XENTOP      := @monitors@

diff --git a/config/Toplevel.mk.in b/config/Toplevel.mk.in
index 1d991895ea0acef466a6565f53f82401af651a70..4ecacbb37d683bff6e682e204bf6f156be25507d 100644 (file)
--- a/config/Toplevel.mk.in
+++ b/config/Toplevel.mk.in
@@ -1,2 +1,2 @@
 SUBSYSTEMS               := @SUBSYSTEMS@
-GIT_HTTP                 := @githttp@
+GIT_HTTP                 ?= @githttp@