From patchwork Wed Jul 18 14:10:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10125 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9073123E56 for ; Wed, 18 Jul 2012 14:26:41 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6090FA180BC for ; Wed, 18 Jul 2012 14:26:41 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so1742015ghb.11 for ; Wed, 18 Jul 2012 07:26:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=hxh3xLPHw6WNIQ9mZ5hYcMLDnxAs3CzYz0eRV29OYgo=; b=YMonMjSo0RyVN8ZjombNUqXGYlQzFfNAguQr3PM8O9Ccrv1Sl/D5FiOW6AV9bts7v/ MlL3NUvZo6QxYvDDy90jO5GqKhTMiXSKaHauZAEz4kjBe/M0DgBFyTfH1k4YhFz7kohZ b3B03nS1UzpcxM2MMoo8R1FZNSd9qh1lzPt+ub0koqEiAI/56aN5/0h0uDptlcL762PP VtQKhXofc1I6ZCnjbs6bXu2hL+iCG8H2nxFkdl0Nbf8n1eQdZfLM2DMaXpfCKZuy5c7Z ppuPom6Wr8k+7kGYDDUlCCNsziJfJaT0Rf6QFGpo3DuQ9nWAfQsBbRzh5VJRieEcguRk oH/w== Received: by 10.50.46.232 with SMTP id y8mr2156287igm.57.1342621600812; Wed, 18 Jul 2012 07:26:40 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.153.7 with SMTP id i7csp370ibw; Wed, 18 Jul 2012 07:26:40 -0700 (PDT) Received: by 10.216.123.5 with SMTP id u5mr693344weh.117.1342621598617; Wed, 18 Jul 2012 07:26:38 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id u8si38464075wia.35.2012.07.18.07.26.38 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 18 Jul 2012 07:26:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SrUxQ-0003KQ-NB; Wed, 18 Jul 2012 15:10:28 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Stefan Weil Subject: [PATCH 10/11] configure: -I\$(SRC_PATH) goes in QEMU_INCLUDES not QEMU_CFLAGS Date: Wed, 18 Jul 2012 15:10:27 +0100 Message-Id: <1342620628-12751-11-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1342620628-12751-1-git-send-email-peter.maydell@linaro.org> References: <1342620628-12751-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQkDj8rwSrH2DCdamT/U5WzBUlHpJ/7GYLt1sHcs2dmwrpAL5Rd3VbinyltKXBFT1dby+AAr If the smartcard configure check passes, add '-I\$(SRC_PATH)/libcacard' to QEMU_INCLUDES, not QEMU_CFLAGS. Otherwise the unexpanded SRC_PATH will cause a warning in every following configure test. Signed-off-by: Peter Maydell --- configure | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 638e486..8140464 100755 --- a/configure +++ b/configure @@ -2656,7 +2656,7 @@ if test "$smartcard" != "no" ; then #include int main(void) { PK11_FreeSlot(0); return 0; } EOF - smartcard_cflags="-I\$(SRC_PATH)/libcacard" + smartcard_includes="-I\$(SRC_PATH)/libcacard" libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs" libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags" test_cflags="$libcacard_cflags" @@ -2670,7 +2670,8 @@ EOF if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \ compile_prog "$test_cflags" "$libcacard_libs"; then smartcard_nss="yes" - QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" + QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags" + QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes" libs_softmmu="$libcacard_libs $libs_softmmu" else if test "$smartcard_nss" = "yes"; then