diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2012-07-30 15:09:13 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2012-07-30 15:09:41 +0100 |
| commit | 947be8ac7af7a3516b9943dec61905bc84d71b6f (patch) | |
| tree | 75b18a70773b9311b96776a6f959819ad9b4c2dd | |
| parent | 10384a5d355356e473b2a4f65bb93a6ece0e3bd1 (diff) | |
| download | qemu-arm-947be8ac7af7a3516b9943dec61905bc84d71b6f.tar.gz | |
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>
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 |