From patchwork Mon Sep 26 16:44:09 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: 9351019 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 623166077A for ; Mon, 26 Sep 2016 16:46:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53A6828969 for ; Mon, 26 Sep 2016 16:46:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47CCB2899E; Mon, 26 Sep 2016 16:46:17 +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 7784028969 for ; Mon, 26 Sep 2016 16:46:16 +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 1boZ0v-0007X2-Hj; Mon, 26 Sep 2016 16:44:21 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1boZ0t-0007VK-Sk for xen-devel@lists.xenproject.org; Mon, 26 Sep 2016 16:44:19 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id C2/1E-21986-36059E75; Mon, 26 Sep 2016 16:44:19 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRWlGSWpSXmKPExsXitHRDpG5SwMt wg91HTSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ox1PW2MBT94Kqa1ljYwXuHqYuTkkBDwl+jq PsYOYrMJ6EhcnLuTrYuRg0NEQEXi9l4DkDCzQKnEld7fTCC2sICbxO63fYwgNouAqsS5K63MI DavgItE36tlzBAjdSUenvvNCmJzCrhKzD//E2y8EFDN+gkH2CDqBSVOznzCAjFfU6J1+292CF teonnrbGaIekWJ/nkP2CBmckvcPj2VeQIj/ywk7bOQtM9C0r6AkXkVo0ZxalFZapGukZFeUlF mekZJbmJmjq6hgZlebmpxcWJ6ak5iUrFecn7uJkZgADIAwQ7GNfMDDzFKcjApifIK+r8MF+JL yk+pzEgszogvKs1JLT7EKMPBoSTB+8QPKCdYlJqeWpGWmQOMBZi0BAePkgivNEgrb3FBYm5xZ jpE6hSjopQ4bx5InwBIIqM0D64NFn+XGGWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMz7CWQKT2 ZeCdz0V0CLmYAWLz3xAmRxSSJCSqqBse6o06NKHZnT0x4yLjO1i361Yfoszan224T1fumy/to gdIlnzal3ZTc0hPvYF+qdv1a5ZcvOhoOlRasuHUpJuGq8NO8wn6D9+idGX8qMnjB7n9oY4Tcn Tzjg7zSnwKXib4pKHkT4h55KN3P+VPbrffPWWcVdPw/o3/WyEFy/OXKWSrr9Y7N7b5VYijMSD bWYi4oTAYOrkRC6AgAA X-Env-Sender: prvs=07040cf8d=roger.pau@citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1474908256!8514940!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28993 invoked from network); 26 Sep 2016 16:44:18 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 26 Sep 2016 16:44:18 -0000 X-IronPort-AV: E=Sophos;i="5.30,400,1470700800"; d="scan'208";a="380682702" From: Roger Pau Monne To: Date: Mon, 26 Sep 2016 18:44:09 +0200 Message-ID: <1474908249-22819-3-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 2.7.4 (Apple Git-66) In-Reply-To: <1474908249-22819-1-git-send-email-roger.pau@citrix.com> References: <1474908249-22819-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson , Wei Liu , Roger Pau Monne Subject: [Xen-devel] [PATCH 2/2] 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é Cc: Wei Liu Cc: Ian Jackson --- Please re-run autogen.sh before committing. --- tools/configure.ac | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/configure.ac b/tools/configure.ac index f010d72..6788ea2 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -222,10 +222,9 @@ AC_ARG_WITH([system-seabios], *) seabios_path=$withval ;; esac ],[]) -AS_IF([test "x$seabios" = "xy"], [ - AC_DEFINE_UNQUOTED([SEABIOS_PATH], - ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"], - [SeaBIOS path]) +AS_IF([test "x$seabios" = "xy"], [seabios_path=$XENFIRMWAREDIR/seabios.bin]) +AS_IF([test -n "$seabios_path"], [ + AC_DEFINE_UNQUOTED([SEABIOS_PATH],["$seabios_path"],[SeaBIOS path]) ]) AC_ARG_WITH([system-ovmf], @@ -239,10 +238,9 @@ AC_ARG_WITH([system-ovmf], *) ovmf_path=$withval ;; esac ],[]) -AS_IF([test "x$ovmf" = "xy"], [ - AC_DEFINE_UNQUOTED([OVMF_PATH], - ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"], - [OVMF path]) +AS_IF([test "x$ovmf" = "xy"], [ovmf_path=$XENFIRMWAREDIR/ovmf.bin]) +AS_IF([test -n "$ovmf_path"], [ + AC_DEFINE_UNQUOTED([OVMF_PATH],["$ovmf_path"],[OVMF path]) ]) AC_ARG_WITH([extra-qemuu-configure-args],