diff options
| author | Paul Brook <paul@codesourcery.com> | 2012-02-09 19:05:29 +0000 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-17 09:58:21 -0600 |
| commit | ad4cf3f6b72b736ab3a41a8f4ed7c0bd4c32352f (patch) | |
| tree | e64225471f3e2fdc97784d0bedd69379fe22931a /configure | |
| parent | 1bbbdabd568fb62125cf214327b4fb5c5d49c694 (diff) | |
| download | qemu-ad4cf3f6b72b736ab3a41a8f4ed7c0bd4c32352f.zip qemu-ad4cf3f6b72b736ab3a41a8f4ed7c0bd4c32352f.tar.gz qemu-ad4cf3f6b72b736ab3a41a8f4ed7c0bd4c32352f.tar.bz2 | |
libcacard configure fixes
libcacard is only used by system emulation.
Only define libcacard_libs/cflags once.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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 |