[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/11] configure: -I\$(SRC_PATH) goes in QEMU_INCLUD
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 10/11] configure: -I\$(SRC_PATH) goes in QEMU_INCLUDES not QEMU_CFLAGS |
Date: |
Wed, 18 Jul 2012 15:10:27 +0100 |
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 <address@hidden>
---
configure | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 638e486..8140464 100755
--- a/configure
+++ b/configure
@@ -2656,7 +2656,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"
@@ -2670,7 +2670,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
--
1.7.5.4
- [Qemu-devel] [PATCH 00/11] configure: Fix -Werror issues, Peter Maydell, 2012/07/18
- [Qemu-devel] [PATCH 01/11] configure: Don't run configure tests with -Werror enabled, Peter Maydell, 2012/07/18
- [Qemu-devel] [PATCH 09/11] configure: Fix compile warning in utimensat/futimens test, Peter Maydell, 2012/07/18
- [Qemu-devel] [PATCH 10/11] configure: -I\$(SRC_PATH) goes in QEMU_INCLUDES not QEMU_CFLAGS,
Peter Maydell <=
- [Qemu-devel] [PATCH 02/11] configure: Fix build with ALSA audio driver, Peter Maydell, 2012/07/18
- [Qemu-devel] [PATCH 03/11] configure: Fix build with capabilities, Peter Maydell, 2012/07/18
- [Qemu-devel] [PATCH 11/11] configure: Check for -Werror causing failures when compiling tests, Peter Maydell, 2012/07/18
- Re: [Qemu-devel] [PATCH 11/11] configure: Check for -Werror causing failures when compiling tests, Blue Swirl, 2012/07/28
- Re: [Qemu-devel] [PATCH 11/11] configure: Check for -Werror causing failures when compiling tests, Peter Maydell, 2012/07/28
- Re: [Qemu-devel] [PATCH 11/11] configure: Check for -Werror causing failures when compiling tests, Blue Swirl, 2012/07/28
- Re: [Qemu-devel] [PATCH 11/11] configure: Check for -Werror causing failures when compiling tests, Peter Maydell, 2012/07/28
- Re: [Qemu-devel] [PATCH 11/11] configure: Check for -Werror causing failures when compiling tests, Blue Swirl, 2012/07/28
- Re: [Qemu-devel] [PATCH 11/11] configure: Check for -Werror causing failures when compiling tests, Blue Swirl, 2012/07/28
- Re: [Qemu-devel] [PATCH 11/11] configure: Check for -Werror causing failures when compiling tests, Peter Maydell, 2012/07/28