From patchwork Thu Feb 9 19:05:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Brook X-Patchwork-Id: 140427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BE1BBB6F9F for ; Fri, 10 Feb 2012 06:32:10 +1100 (EST) Received: from localhost ([::1]:36938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvZJX-0002IC-JS for incoming@patchwork.ozlabs.org; Thu, 09 Feb 2012 14:05:51 -0500 Received: from eggs.gnu.org ([140.186.70.92]:38733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvZJM-0002HO-L7 for qemu-devel@nongnu.org; Thu, 09 Feb 2012 14:05:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvZJG-0003ZD-Va for qemu-devel@nongnu.org; Thu, 09 Feb 2012 14:05:40 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:58970) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvZJG-0003Z7-R6 for qemu-devel@nongnu.org; Thu, 09 Feb 2012 14:05:34 -0500 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1RvZJG-0007WF-6x from Paul_Brook@mentor.com for qemu-devel@nongnu.org; Thu, 09 Feb 2012 11:05:34 -0800 Received: from nowt.org ([172.30.64.210]) by EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Thu, 9 Feb 2012 19:05:33 +0000 Received: from wren.home (wren.home [192.168.93.7]) by nowt.org (Postfix) with ESMTP id B455A6EE46; Thu, 9 Feb 2012 19:05:32 +0000 (GMT) From: Paul Brook To: qemu-devel@nongnu.org Date: Thu, 9 Feb 2012 19:05:29 +0000 Message-Id: <1328814329-9071-1-git-send-email-paul@codesourcery.com> X-Mailer: git-send-email 1.7.8.3 X-OriginalArrivalTime: 09 Feb 2012 19:05:33.0188 (UTC) FILETIME=[CC43EC40:01CCE75D] X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 192.94.38.131 Cc: Paul Brook Subject: [Qemu-devel] [PATCH] libcacard configure fixes 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 libcacard is only used by system emulation. Only define libcacard_libs/cflags once. Signed-off-by: Paul Brook --- configure | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 763db24..faa65a8 100755 --- a/configure +++ b/configure @@ -2569,7 +2569,7 @@ EOF compile_prog "$smartcard_cflags $libcacard_cflags" "$libcacard_libs"; then smartcard_nss="yes" QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" - LIBS="$libcacard_libs $LIBS" + libs_softmmu="$libcacard_libs $libs_softmmu" else if test "$smartcard_nss" = "yes"; then feature_not_found "nss" @@ -3209,6 +3209,8 @@ fi if test "$smartcard_nss" = "yes" ; then echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak + echo "libcacard_libs=$libcacard_libs" >> $config_host_mak + echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak fi if test "$usb_redir" = "yes" ; then @@ -3628,6 +3630,9 @@ if test "$target_softmmu" = "yes" ; then echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak + if test "$smartcard_nss" = "yes" ; then + echo "subdir-$target: subdir-libcacard" >> $config_host_mak + fi fi if test "$target_user_only" = "yes" ; then echo "CONFIG_USER_ONLY=y" >> $config_target_mak @@ -3639,11 +3644,6 @@ fi if test "$target_darwin_user" = "yes" ; then echo "CONFIG_DARWIN_USER=y" >> $config_target_mak fi -if test "$smartcard_nss" = "yes" ; then - echo "subdir-$target: subdir-libcacard" >> $config_host_mak - echo "libcacard_libs=$libcacard_libs" >> $config_host_mak - echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak -fi list="" if test ! -z "$gdb_xml_files" ; then for x in $gdb_xml_files; do