From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:39400)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RySMi-0003Y6-7b
	for qemu-devel@nongnu.org; Fri, 17 Feb 2012 13:17:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RySMb-0002s6-OH
	for qemu-devel@nongnu.org; Fri, 17 Feb 2012 13:17:04 -0500
Received: from mail-pw0-f45.google.com ([209.85.160.45]:38074)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RySMb-0002rW-Ij
	for qemu-devel@nongnu.org; Fri, 17 Feb 2012 13:16:57 -0500
Received: by pbbro12 with SMTP id ro12so4829620pbb.4
	for <qemu-devel@nongnu.org>; Fri, 17 Feb 2012 10:16:56 -0800 (PST)
Message-ID: <4F3E9995.1060601@codemonkey.ws>
Date: Fri, 17 Feb 2012 12:16:53 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1328814329-9071-1-git-send-email-paul@codesourcery.com>
In-Reply-To: <1328814329-9071-1-git-send-email-paul@codesourcery.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] libcacard configure fixes
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paul Brook <paul@codesourcery.com>
Cc: qemu-devel@nongnu.org

On 02/09/2012 01:05 PM, Paul Brook wrote:
> libcacard is only used by system emulation.
> Only define libcacard_libs/cflags once.
>
> Signed-off-by: Paul Brook<paul@codesourcery.com>

Ah, I applied this without realizing it was from pbrook :-)

Regards,

Anthony Liguori

> ---
>   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