Patch to honor --enable-githttp

Commit Message

Paul Lai May 2, 2016, 3:55 p.m. UTC

commit 747f48e6dd7bcc2fbe14d37c62018c5c9e0e44c8
Author: Paul Lai <[e-mail]>
Date:   Mon Apr 11 10:43:57 2016 -0700

    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 <[e-mail]>

Patch

diff --git a/config/Toplevel.mk.in b/config/Toplevel.mk.in
index 4db7eaf..1d99189 100644
--- 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 3c269fa..78e8025 100755
--- a/configure
+++ b/configure
@@ -594,6 +594,7 @@  stubdom
 tools
 xen
 subdirs
+githttp
 XEN_DUMP_DIR
 XEN_PAGING_DIR
 XEN_LOCK_DIR
@@ -660,6 +661,7 @@  enable_option_checking
 with_initddir
 with_sysconfig_leaf_dir
 with_xen_dumpdir
+enable_githttp
 enable_xen
 enable_tools
 enable_stubdom
@@ -1284,6 +1286,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
@@ -1985,6 +1989,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 1843b52..7388b28 100644
--- 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