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>
This commit is contained in:
Paul Lai authored and Wei Liu committed 2016-05-05 11:34:09 +01:00
1 parent adf7d04317
commit f8d4c1d5c5
3 files changed
+29

No files matched your search

+1
View File
@@ -1 +1,2 @@
SUBSYSTEMS := @SUBSYSTEMS@
GIT_HTTP := @githttp@
Vendored
+27
View File
@@ -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
+1
View File
@@ -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
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.