From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvaDG-0008IO-WD for qemu-devel@nongnu.org; Thu, 09 Feb 2012 15:03:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvaDA-0004ue-H4 for qemu-devel@nongnu.org; Thu, 09 Feb 2012 15:03:26 -0500 Received: from cantor2.suse.de ([195.135.220.15]:59895 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvaDA-0004u2-4N for qemu-devel@nongnu.org; Thu, 09 Feb 2012 15:03:20 -0500 Message-ID: <4F342685.2070004@suse.de> Date: Thu, 09 Feb 2012 21:03:17 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= 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-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] libcacard configure fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Brook Cc: Alon Levy , qemu-devel@nongnu.org Am 09.02.2012 20:05, schrieb Paul Brook: > libcacard is only used by system emulation. > Only define libcacard_libs/cflags once. >=20 > Signed-off-by: Paul Brook Looks okay on first sight, but Alon (cc'ed) may want to check. Andreas > --- > configure | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) >=20 > 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" "$libcaca= rd_libs"; then > smartcard_nss=3D"yes" > QEMU_CFLAGS=3D"$QEMU_CFLAGS $smartcard_cflags $libcacard_c= flags" > - LIBS=3D"$libcacard_libs $LIBS" > + libs_softmmu=3D"$libcacard_libs $libs_softmmu" > else > if test "$smartcard_nss" =3D "yes"; then > feature_not_found "nss" > @@ -3209,6 +3209,8 @@ fi > =20 > if test "$smartcard_nss" =3D "yes" ; then > echo "CONFIG_SMARTCARD_NSS=3Dy" >> $config_host_mak > + echo "libcacard_libs=3D$libcacard_libs" >> $config_host_mak > + echo "libcacard_cflags=3D$libcacard_cflags" >> $config_host_mak > fi > =20 > if test "$usb_redir" =3D "yes" ; then > @@ -3628,6 +3630,9 @@ if test "$target_softmmu" =3D "yes" ; then > echo "LIBS+=3D$libs_softmmu $target_libs_softmmu" >> $config_target_= mak > echo "HWDIR=3D../libhw$target_phys_bits" >> $config_target_mak > echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host= _mak > + if test "$smartcard_nss" =3D "yes" ; then > + echo "subdir-$target: subdir-libcacard" >> $config_host_mak > + fi > fi > if test "$target_user_only" =3D "yes" ; then > echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak > @@ -3639,11 +3644,6 @@ fi > if test "$target_darwin_user" =3D "yes" ; then > echo "CONFIG_DARWIN_USER=3Dy" >> $config_target_mak > fi > -if test "$smartcard_nss" =3D "yes" ; then > - echo "subdir-$target: subdir-libcacard" >> $config_host_mak > - echo "libcacard_libs=3D$libcacard_libs" >> $config_host_mak > - echo "libcacard_cflags=3D$libcacard_cflags" >> $config_host_mak > -fi > list=3D"" > if test ! -z "$gdb_xml_files" ; then > for x in $gdb_xml_files; do --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg