Signed-off-by: Alon Levy <al...@redhat.com> --- configure | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/configure b/configure index 8b86c9a..27e5488 100755 --- a/configure +++ b/configure @@ -174,8 +174,8 @@ trace_backend="nop" trace_file="trace" spice="" rbd="" -smartcard="yes" -smartcard_nss="yes" +smartcard="" +smartcard_nss="" # parse CC options first for opt do @@ -725,6 +725,10 @@ for opt do ;; --enable-smartcard) smartcard="yes" ;; + --disable-smartcard-nss) smartcard_nss="no" + ;; + --enable-smartcard-nss) smartcard_nss="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -922,6 +926,8 @@ echo " --enable-spice enable spice" echo " --enable-rbd enable building the rados block device (rbd)" echo " --disable-smartcard disable smartcard support" echo " --enable-smartcard enable smartcard support" +echo " --disable-smartcard-nss disable smartcard nss support" +echo " --enable-smartcard-nss enable smartcard nss support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2249,16 +2255,22 @@ 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) # TODO - what's the minimal nss version we support? - if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 ; then - smartcard_nss="yes" - QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" - LIBS="$libcacard_libs $LIBS" - else - smartcard_nss="no" + if test "$smartcard_nss" != "no"; then + if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 ; then + smartcard_nss="yes" + QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" + LIBS="$libcacard_libs $LIBS" + else + if test "$smartcard_nss" == "yes"; then + feature_not_found "nss" + fi + smartcard_nss="no" + fi fi fi if test "$smartcard" == "no" ; then -- 1.7.4