From patchwork Tue Sep 27 08:13:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9351587 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 68A916077B for ; Tue, 27 Sep 2016 08:15:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A7752845B for ; Tue, 27 Sep 2016 08:15:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F1C628F4B; Tue, 27 Sep 2016 08:15:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A8F02845B for ; Tue, 27 Sep 2016 08:15: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 1bonW2-0007YU-2T; Tue, 27 Sep 2016 08:13:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bonVz-0007YI-TG for xen-devel@lists.xenproject.org; Tue, 27 Sep 2016 08:13:24 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id B7/4E-28813-32A2AE75; Tue, 27 Sep 2016 08:13:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrrBXldJ61W 4waElRhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bO/3/ZCy5zVcx+fJ29gXEvRxcjJ4eEgL/E 2hmz2UBsNgEdiYtzdwLZHBwiAioSt/cagISZBUolrvT+ZgKxhQVcJRq/rmcFsVkEVCWeTZjMC FLOK+Ai8fKsCcREXYmH536DlfAKCEqcnPmEBWKMpkTr9t/sELa8RPPW2cwgtpCAokT/vAdsEL 3cErdPT2WewMg7C0n7LCTts5C0L2BkXsWoUZxaVJZapGtoqJdUlJmeUZKbmJmja2hgrJebWly cmJ6ak5hUrJecn7uJERhQDECwg3H1b6dDjJIcTEqivAWqr8KF+JLyUyozEosz4otKc1KLDzHK cHAoSfA+1gDKCRalpqdWpGXmAEMbJi3BwaMkwtsCkuYtLkjMLc5Mh0idYlSUEufdCpIQAElkl ObBtcHi6RKjrJQwLyPQIUI8BalFuZklqPKvGMU5GJWEeTk1gabwZOaVwE1/BbSYCWjx0hMvQB aXJCKkpBoYZd20P7hKhsx6r3mqT24K74lv1zk+fdN2uP7lZFNF6syXUwxaDy2fcyNP6mTrsbm vV/6elh1XOuHHBfMLP9zXOOXdY17oalCWUlryqfCB1umC+262TYwLnpZvEl4gfsKJnWeG2MTq ePMMGzHz1j630IizcRvmeNRHaBqfPH1kA8ufVVLP7SP+KrEUZyQaajEXFScCAEV63I6iAgAA X-Env-Sender: prvs=071b8e69e=roger.pau@citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1474964001!55294945!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31382 invoked from network); 27 Sep 2016 08:13:22 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 27 Sep 2016 08:13:22 -0000 X-IronPort-AV: E=Sophos;i="5.30,404,1470700800"; d="scan'208";a="389058013" From: Roger Pau Monne To: Date: Tue, 27 Sep 2016 10:13:17 +0200 Message-ID: <1474963997-24085-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 2.7.4 (Apple Git-66) MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson , Wei Liu , Roger Pau Monne Subject: [Xen-devel] [PATCH v2] tools/configure: fix --with-system-{ovmf/seabios} 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Current configure code doesn't define {SEABIOS/OVMF}_PATH when --with-system-{ovmf/seabios} is used. Fix this by making sure those defines are always set if the internal {ovmf/seabios}_path variables are also set. Signed-off-by: Roger Pau Monné Suggested-by: Wei Liu Cc: Wei Liu Cc: Ian Jackson Acked-by: Wei Liu --- Please re-run autogen.sh before committing. --- tools/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure.ac b/tools/configure.ac index f010d72..5724ace 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -222,7 +222,7 @@ AC_ARG_WITH([system-seabios], *) seabios_path=$withval ;; esac ],[]) -AS_IF([test "x$seabios" = "xy"], [ +AS_IF([test "x$seabios" = "xy" -o -n "$seabios_path" ], [ AC_DEFINE_UNQUOTED([SEABIOS_PATH], ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"], [SeaBIOS path]) @@ -239,7 +239,7 @@ AC_ARG_WITH([system-ovmf], *) ovmf_path=$withval ;; esac ],[]) -AS_IF([test "x$ovmf" = "xy"], [ +AS_IF([test "x$ovmf" = "xy" -o -n "$ovmf_path" ], [ AC_DEFINE_UNQUOTED([OVMF_PATH], ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"], [OVMF path])