build: Honor '--enable-githttp' in toplevel Makefile generation

During the make world, git mini-os.git didn't honor the 'configure
--enable-githttp' option.  The 'enable-githttp' was only honored in
the tools subdirectory.

Signed-off-by: Paul Lai <paul.c.lai@intel.com>
[ wei: add prefix "build:" to title ]
Acked-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>

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

diff --git a/configure b/configure
index c200eed7318959497d4ec48a1b091de4496f102f..8b07126a1045717bdcff590f05d42cdeafa9ff44 100755 (executable)
--- a/configure
+++ b/configure
@@ -594,6 +594,7 @@ stubdom
 tools
 xen
 subdirs
+githttp
 XEN_DUMP_DIR
 XEN_PAGING_DIR
 XEN_LOCK_DIR
@@ -664,6 +665,7 @@ with_initddir
 with_sysconfig_leaf_dir
 with_libexec_leaf_dir
 with_xen_dumpdir
+enable_githttp
 enable_xen
 enable_tools
 enable_stubdom
@@ -1288,6 +1290,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-githttp        Download GIT repositories via HTTP (default is
+                          DISABLED)
   --disable-xen           Disable build and install of xen
   --disable-tools         Disable build and install of tools
   --enable-stubdom        Enable build and install of stubdom
@@ -2005,6 +2009,29 @@ XEN_DUMP_DIR=$xen_dumpdir_path
 
 
 
+# Check whether --enable-githttp was given.
+if test "${enable_githttp+set}" = set; then :
+  enableval=$enable_githttp;
+fi
+
+
+if test "x$enable_githttp" = "xno"; then :
+
+    ax_cv_githttp="n"
+
+elif test "x$enable_githttp" = "xyes"; then :
+
+    ax_cv_githttp="y"
+
+elif test -z $ax_cv_githttp; then :
+
+    ax_cv_githttp="n"
+
+fi
+githttp=$ax_cv_githttp
+
+
+
 case "$host_cpu" in
     i[3456]86|x86_64)
         arch_enable_stubdom=y

diff --git a/configure.ac b/configure.ac
index 1843b527e07c474583ce36c1b711d07351d9bb44..7388b282f9a9eedec45b65c908e3f3b42095d517 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ m4_include([m4/subsystem.m4])
 m4_include([m4/paths.m4])
 
 AX_XEN_EXPAND_CONFIG()
+AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP])
 
 dnl mini-os is only ported to certain platforms
 case "$host_cpu" in