Revision 111a38b0 configure
| b/configure | ||
|---|---|---|
| 176 | 176 |
spice="" |
| 177 | 177 |
rbd="" |
| 178 | 178 |
smartcard="" |
| 179 |
smartcard_nss="" |
|
| 179 | 180 |
|
| 180 | 181 |
# parse CC options first |
| 181 | 182 |
for opt do |
| ... | ... | |
| 729 | 730 |
;; |
| 730 | 731 |
--enable-smartcard) smartcard="yes" |
| 731 | 732 |
;; |
| 733 |
--disable-smartcard-nss) smartcard_nss="no" |
|
| 734 |
;; |
|
| 735 |
--enable-smartcard-nss) smartcard_nss="yes" |
|
| 736 |
;; |
|
| 732 | 737 |
*) echo "ERROR: unknown option $opt"; show_help="yes" |
| 733 | 738 |
;; |
| 734 | 739 |
esac |
| ... | ... | |
| 928 | 933 |
echo " --enable-rbd enable building the rados block device (rbd)" |
| 929 | 934 |
echo " --disable-smartcard disable smartcard support" |
| 930 | 935 |
echo " --enable-smartcard enable smartcard support" |
| 936 |
echo " --disable-smartcard-nss disable smartcard nss support" |
|
| 937 |
echo " --enable-smartcard-nss enable smartcard nss support" |
|
| 931 | 938 |
echo "" |
| 932 | 939 |
echo "NOTE: The object files are built at the place where configure is launched" |
| 933 | 940 |
exit 1 |
| ... | ... | |
| 2311 | 2318 |
fi |
| 2312 | 2319 |
fi |
| 2313 | 2320 |
|
| 2321 |
# check for libcacard for smartcard support |
|
| 2322 |
if test "$smartcard" != "no" ; then |
|
| 2323 |
smartcard="yes" |
|
| 2324 |
smartcard_cflags="" |
|
| 2325 |
# TODO - what's the minimal nss version we support? |
|
| 2326 |
if test "$smartcard_nss" != "no"; then |
|
| 2327 |
if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 ; then |
|
| 2328 |
smartcard_nss="yes" |
|
| 2329 |
smartcard_cflags="-I\$(SRC_PATH)/libcacard" |
|
| 2330 |
libcacard_libs=$($pkg_config --libs nss 2>/dev/null) |
|
| 2331 |
libcacard_cflags=$($pkg_config --cflags nss 2>/dev/null) |
|
| 2332 |
QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" |
|
| 2333 |
LIBS="$libcacard_libs $LIBS" |
|
| 2334 |
else |
|
| 2335 |
if test "$smartcard_nss" = "yes"; then |
|
| 2336 |
feature_not_found "nss" |
|
| 2337 |
fi |
|
| 2338 |
smartcard_nss="no" |
|
| 2339 |
fi |
|
| 2340 |
fi |
|
| 2341 |
fi |
|
| 2342 |
if test "$smartcard" = "no" ; then |
|
| 2343 |
smartcard_nss="no" |
|
| 2344 |
fi |
|
| 2345 |
|
|
| 2314 | 2346 |
########################################## |
| 2315 | 2347 |
|
| 2316 | 2348 |
########################################## |
| ... | ... | |
| 2549 | 2581 |
echo "spice support $spice" |
| 2550 | 2582 |
echo "rbd support $rbd" |
| 2551 | 2583 |
echo "xfsctl support $xfs" |
| 2584 |
echo "nss used $smartcard_nss" |
|
| 2552 | 2585 |
|
| 2553 | 2586 |
if test $sdl_too_old = "yes"; then |
| 2554 | 2587 |
echo "-> Your SDL version is too old - please upgrade to have SDL support" |
| ... | ... | |
| 2835 | 2868 |
echo "CONFIG_SMARTCARD=y" >> $config_host_mak |
| 2836 | 2869 |
fi |
| 2837 | 2870 |
|
| 2871 |
if test "$smartcard_nss" = "yes" ; then |
|
| 2872 |
echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak |
|
| 2873 |
fi |
|
| 2874 |
|
|
| 2838 | 2875 |
# XXX: suppress that |
| 2839 | 2876 |
if [ "$bsd" = "yes" ] ; then |
| 2840 | 2877 |
echo "CONFIG_BSD=y" >> $config_host_mak |
| ... | ... | |
| 3183 | 3220 |
if test "$target_darwin_user" = "yes" ; then |
| 3184 | 3221 |
echo "CONFIG_DARWIN_USER=y" >> $config_target_mak |
| 3185 | 3222 |
fi |
| 3223 |
if test "$smartcard_nss" = "yes" ; then |
|
| 3224 |
echo "subdir-$target: subdir-libcacard" >> $config_host_mak |
|
| 3225 |
echo "libcacard_libs=$libcacard_libs" >> $config_host_mak |
|
| 3226 |
echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak |
|
| 3227 |
fi |
|
| 3186 | 3228 |
list="" |
| 3187 | 3229 |
if test ! -z "$gdb_xml_files" ; then |
| 3188 | 3230 |
for x in $gdb_xml_files; do |
| ... | ... | |
| 3396 | 3438 |
echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak |
| 3397 | 3439 |
done |
| 3398 | 3440 |
|
| 3441 |
if [ "$source_path" != `pwd` ]; then |
|
| 3442 |
# out of tree build |
|
| 3443 |
mkdir -p libcacard |
|
| 3444 |
rm -f libcacard/Makefile |
|
| 3445 |
ln -s "$source_path/libcacard/Makefile" libcacard/Makefile |
|
| 3446 |
fi |
|
| 3447 |
|
|
| 3399 | 3448 |
d=libuser |
| 3400 | 3449 |
mkdir -p $d |
| 3401 | 3450 |
symlink $source_path/Makefile.user $d/Makefile |
Also available in: Unified diff