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: 171698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0A9AF2C0109 for ; Thu, 19 Jul 2012 00:31:46 +1000 (EST) Received: from localhost ([::1]:56313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrUyF-0008Sk-At for incoming@patchwork.ozlabs.org; Wed, 18 Jul 2012 10:11:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrUxc-0006cR-IU for qemu-devel@nongnu.org; Wed, 18 Jul 2012 10:10:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrUxW-0006NB-NM for qemu-devel@nongnu.org; Wed, 18 Jul 2012 10:10:40 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:53934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrUxW-0006N5-Gw for qemu-devel@nongnu.org; Wed, 18 Jul 2012 10:10:34 -0400 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 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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Stefan Weil , patches@linaro.org Subject: [Qemu-devel] [PATCH 10/11] configure: -I\$(SRC_PATH) goes in QEMU_INCLUDES not QEMU_CFLAGS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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