--- qemu-1.7.0/configure.orig 2013-12-15 08:38:07.584329114 +0100
+++ qemu-1.7.0/configure 2013-12-15 08:54:19.730954984 +0100
-@@ -3123,9 +3123,10 @@
- #include <pk11pub.h>
+@@ -3543,9 +3543,11 @@
int main(void) { PK11_FreeSlot(0); return 0; }
EOF
-- smartcard_includes="-I\$(SRC_PATH)/libcacard"
-- libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
-- libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
+ # FIXME: do not include $glib_* in here
+ libcacard_libs="$($pkg_config --libs libcacard 2>/dev/null)"
+ libcacard_cflags="$($pkg_config --cflags libcacard 2>/dev/null)"
-+ nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
-+ nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
- test_cflags="$libcacard_cflags"
+ nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
+ nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
+- test_cflags="$nss_cflags"
++ test_cflags="$libcacard_cflags"
# The header files in nss < 3.13.3 have a bug which causes them to
# emit a warning. If we're going to compile QEMU with -Werror, then
-@@ -3136,11 +3137,10 @@
- fi
- if test -n "$libtool" &&
+ # test that the headers don't have this bug. Otherwise we would pass
+@@ -3557,6 +3559,8 @@
$pkg_config --atleast-version=3.12.8 nss && \
-- compile_prog "$test_cflags" "$libcacard_libs"; then
-+ compile_prog "$test_cflags" "$nss_libs"; then
+ compile_prog "$test_cflags" "$nss_libs"; then
smartcard_nss="yes"
-- QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
-- QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
-- libs_softmmu="$libcacard_libs $libs_softmmu"
+ QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags $nss_cflags"
+ libs_softmmu="$libcacard_libs $nss_libs $libs_softmmu"
else
if test "$smartcard_nss" = "yes"; then
feature_not_found "nss"
-@@ -4082,6 +4082,8 @@
+@@ -4574,6 +4578,8 @@
+
+ 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
-+ echo "nss_libs=$nss_libs" >> $config_host_mak
-+ echo "nss_cflags=$nss_cflags" >> $config_host_mak
++ echo "LIBCACARD_LIBS=$libcacard_libs" >> $config_host_mak
++ echo "LIBCACARD_CFLAGS=$libcacard_cflags" >> $config_host_mak
+ echo "NSS_LIBS=$nss_libs" >> $config_host_mak
+ echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak
fi
-
- if test "$libusb" = "yes" ; then
--- qemu-1.3.0/Makefile.orig 2012-12-03 20:37:05.000000000 +0100
+++ qemu-1.3.0/Makefile 2012-12-16 11:08:58.001201236 +0100
@@ -111,9 +111,6 @@