[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] ccid: configure: add --enable-smartcard and --d
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCH 6/6] ccid: configure: add --enable-smartcard and --disable-smartcard |
Date: |
Tue, 11 Jan 2011 10:42:38 +0200 |
---
configure | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index 4567057..ebc8250 100755
--- a/configure
+++ b/configure
@@ -748,6 +748,10 @@ for opt do
;;
--enable-rbd) rbd="yes"
;;
+ --disable-smartcard) smartcard="no"
+ ;;
+ --enable-smartcard) smartcard="yes"
+ ;;
*) echo "ERROR: unknown option $opt"; show_help="yes"
;;
esac
@@ -942,6 +946,8 @@ echo " Default:trace-<pid>"
echo " --disable-spice disable spice"
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 ""
echo "NOTE: The object files are built at the place where configure is
launched"
exit 1
@@ -2210,16 +2216,18 @@ EOF
fi
# check for libcacard for smartcard support
-smartcard_cflags="-I\$(SRC_PATH)/libcacard"
-libcacard_libs=$($pkgconfig --libs nss 2>/dev/null)
-libcacard_cflags=$($pkgconfig --cflags nss)
-# TODO - what's the minimal nss version we support?
-if $pkgconfig --atleast-version=3.12.8 nss; then
- smartcard="yes"
- QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
- LIBS="$libcacard_libs $LIBS"
-else
- smartcard="no"
+if test "$smartcard" != "no" ; then
+ smartcard_cflags="-I\$(SRC_PATH)/libcacard"
+ libcacard_libs=$($pkgconfig --libs nss 2>/dev/null)
+ libcacard_cflags=$($pkgconfig --cflags nss)
+ # TODO - what's the minimal nss version we support?
+ if $pkgconfig --atleast-version=3.12.8 nss; then
+ smartcard="yes"
+ QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
+ LIBS="$libcacard_libs $LIBS"
+ else
+ smartcard="no"
+ fi
fi
##########################################
--
1.7.3.4
- [Qemu-devel] [PATCH 0/7] usb-ccid (v15), Alon Levy, 2011/01/11
- [Qemu-devel] [PATCH 5/7] ccid: add docs, Alon Levy, 2011/01/11
- [Qemu-devel] [PATCH 6/6] ccid: configure: add --enable-smartcard and --disable-smartcard,
Alon Levy <=
- [Qemu-devel] [PATCH 2/7] ccid: add passthru card device, Alon Levy, 2011/01/11
- Re: [Qemu-devel] [PATCH 2/7] ccid: add passthru card device, Alon Levy, 2011/01/28
- Re: [Qemu-devel] [PATCH 2/7] ccid: add passthru card device, Anthony Liguori, 2011/01/28
- Re: [Qemu-devel] [PATCH 2/7] ccid: add passthru card device, Alon Levy, 2011/01/30
[Qemu-devel] [PATCH 7/7] ccid: add qdev description strings, Alon Levy, 2011/01/11