Patchwork [15/16] ccid-card-emulated: don't link with NSS if --disable-smartcard-nss

login
register
mail settings
Submitter Alon Levy
Date Feb. 3, 2011, 10:45 p.m.
Message ID <1296773152-23279-16-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/81773/
State New
Headers show

Comments

Alon Levy - Feb. 3, 2011, 10:45 p.m.
---
 configure |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/configure b/configure
index 2cd73b4..4189814 100755
--- a/configure
+++ b/configure
@@ -2256,13 +2256,14 @@  fi
 # check for libcacard for smartcard support
 if test "$smartcard" != "no" ; then
     smartcard="yes"
-    smartcard_cflags="-I\$(SRC_PATH)/libcacard"
-    libcacard_libs=$($pkg_config --libs nss 2>/dev/null)
-    libcacard_cflags=$($pkg_config --cflags nss 2>/dev/null)
+    smartcard_cflags=""
     # TODO - what's the minimal nss version we support?
     if test "$smartcard_nss" != "no"; then
         if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 ; then
             smartcard_nss="yes"
+            smartcard_cflags="-I\$(SRC_PATH)/libcacard"
+            libcacard_libs=$($pkg_config --libs nss 2>/dev/null)
+            libcacard_cflags=$($pkg_config --cflags nss 2>/dev/null)
             QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
             LIBS="$libcacard_libs $LIBS"
         else