From patchwork Wed May 4 15:54:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Lai X-Patchwork-Id: 9017101 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5FF46BF29F for ; Wed, 4 May 2016 17:25:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 814DD203B4 for ; Wed, 4 May 2016 17:25:30 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A0CDC20390 for ; Wed, 4 May 2016 17:25:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ay0W5-0008Dl-Ds; Wed, 04 May 2016 17:23:17 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ay0W4-0008DZ-IR for xen-devel@lists.xenproject.org; Wed, 04 May 2016 17:23:16 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 74/CE-07120-3003A275; Wed, 04 May 2016 17:23:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRWlGSWpSXmKPExsVywNykQpfZQCv c4M08aYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPPtnb2glNCFQt2rmRqYGzh72Lk5BASqJSY 23aDDcSWEOCVOLJsBiuE7S9x4vIkRoiaConVf5YD2VxA9nZGiS3rXrJBJEok7u9cDFbEJqAqs fwcRIOIgJLEvVWTmboYOTiYBXQl3s4TBAkLC3hKXFn9B2w+C1D5jQ3LwGxeAWeJ3XvXsUDslZ M4eWwy6wRG3gWMDKsY1YtTi8pSi3SN9ZKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpOK9ZLzczc xAkOBAQh2MHb8czrEKMnBpCTKO0lLK1yILyk/pTIjsTgjvqg0J7X4EKMMB4eSBO9WPaCcYFFq empFWmYOMChh0hIcPEoivH4gad7igsTc4sx0iNQpRkUpcd6VIAkBkERGaR5cGywSLjHKSgnzM gIdIsRTkFqUm1mCKv+KUZyDUUmYdyPIFJ7MvBK46a+AFjMBLX4/VxNkcUkiQkqqgVHl4GY5rt 5j52fs1lLfczRA+4mNYMW0v7dc/kTp3N4yealsPFNz9KvgqxcmOUyO0lnp1hq6NEBxf9PLJed +ZVuYsE7vuiFwnHvm5JveBlwKHvKPOZ8xeeUwrudtK2c2nxhq8cLX6Mu1/TO0Pfp1U9YarBKK cju08vpnFZkIK6XKv4eCNsn7JiqxFGckGmoxFxUnAgDRWLx+fwIAAA== X-Env-Sender: pclai@intel.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1462382594!12602378!1 X-Originating-IP: [192.55.52.120] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19138 invoked from network); 4 May 2016 17:23:15 -0000 Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by server-15.tower-21.messagelabs.com with SMTP; 4 May 2016 17:23:15 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP; 04 May 2016 10:23:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,578,1455004800"; d="scan'208";a="958898283" Received: from scymds02.sc.intel.com ([10.82.195.37]) by fmsmga001.fm.intel.com with ESMTP; 04 May 2016 10:23:13 -0700 Received: from pclaidev.sc.intel.com (rhel7-dev.sc.intel.com [143.183.85.147] (may be forged)) by scymds02.sc.intel.com with ESMTP id u44HNDPX023077; Wed, 4 May 2016 10:23:13 -0700 Received: by pclaidev.sc.intel.com (Postfix, from userid 1002) id 10C5423797; Wed, 4 May 2016 08:54:25 -0700 (PDT) From: Paul Lai To: xen-devel@lists.xenproject.org Date: Wed, 4 May 2016 08:54:07 -0700 Message-Id: <1462377247-1187-1-git-send-email-paul.c.lai@intel.com> X-Mailer: git-send-email 1.9.1 Cc: paul.c.lai@intel.com, wei.liu2@citrix.com Subject: [Xen-devel] [PATCH] Honor '--enable-githttp' in toplevel Makefile generation X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Wei Liu --- config/Toplevel.mk.in | 1 + configure | 27 +++++++++++++++++++++++++++ configure.ac | 1 + 3 files changed, 29 insertions(+) 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 c200eed..8b07126 100755 --- 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 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