From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 18 Jul 2012 14:10:27 +0000 (+0100)
Subject: configure: -I\$(SRC_PATH) goes in QEMU_INCLUDES not QEMU_CFLAGS
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0b22ef0f57a8910d849602bef0940edcd0553d2c;p=qemu.git

configure: -I\$(SRC_PATH) goes in QEMU_INCLUDES not QEMU_CFLAGS

If the smartcard configure check passes, add '-I\$(SRC_PATH)/libcacard'
to QEMU_INCLUDES, not QEMU_CFLAGS. Otherwise the unexpanded SRC_PATH
will cause a warning in every following configure test.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/configure b/configure
index 288f1a25d7..027a718140 100755
--- a/configure
+++ b/configure
@@ -2658,7 +2658,7 @@ if test "$smartcard" != "no" ; then
 #include <pk11pub.h>
 int main(void) { PK11_FreeSlot(0); return 0; }
 EOF
-        smartcard_cflags="-I\$(SRC_PATH)/libcacard"
+        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"
         test_cflags="$libcacard_cflags"
@@ -2672,7 +2672,8 @@ EOF
         if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \
           compile_prog "$test_cflags" "$libcacard_libs"; then
             smartcard_nss="yes"
-            QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
+            QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
+            QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
             libs_softmmu="$libcacard_libs $libs_softmmu"
         else
             if test "$smartcard_nss" = "yes"; then