On Fri, Feb 17, 2012 at 12:16:53PM -0600, Anthony Liguori wrote: > 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<[email protected]> > > Ah, I applied this without realizing it was from pbrook :-) >
Fine by me. > 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 > >
