aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schiele <rschiele@gmail.com>2012-12-04 16:58:08 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2012-12-23 14:38:52 -0600
commit74880fe27d2120ab3861dc857ecd025db1a67038 (patch)
tree71511ef2d164e1635457e24b46fcd110ed2584d0
parent2915efbfa8efadaa2806e827ba92b8dba4f7cd52 (diff)
configure: allow disabling pixman if not needed
When we build neither any system emulation targets nor the tools there is actually no need for pixman library. In that case do not enforce presence of that library on the system. Reviewed-by: Andreas F=E4rber <afaerber@suse.de> Signed-off-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rwxr-xr-xconfigure18
-rw-r--r--target-unicore32/helper.c2
2 files changed, 18 insertions, 2 deletions
diff --git a/configure b/configure
index 14f05c7b90..99c1ec3467 100755
--- a/configure
+++ b/configure
@@ -656,6 +656,8 @@ for opt do
;;
--without-system-pixman) pixman="internal"
;;
+ --without-pixman) pixman="none"
+ ;;
--disable-sdl) sdl="no"
;;
--enable-sdl) sdl="yes"
@@ -2130,13 +2132,25 @@ fi
# pixman support probe
if test "$pixman" = ""; then
- if $pkg_config pixman-1 > /dev/null 2>&1; then
+ if test "$want_tools" = "no" -a "$softmmu" = "no"; then
+ pixman="none"
+ elif $pkg_config pixman-1 > /dev/null 2>&1; then
pixman="system"
else
pixman="internal"
fi
fi
-if test "$pixman" = "system"; then
+if test "$pixman" = "none"; then
+ if test "$want_tools" != "no" -o "$softmmu" != "no"; then
+ echo "ERROR: pixman disabled but system emulation or tools build"
+ echo " enabled. You can turn off pixman only if you also"
+ echo " disable all system emulation targets and the tools"
+ echo " build with '--disable-tools --disable-system'."
+ exit 1
+ fi
+ pixman_cflags=
+ pixman_libs=
+elif test "$pixman" = "system"; then
pixman_cflags=`$pkg_config --cflags pixman-1 2>/dev/null`
pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null`
else
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index ff4f628404..5359538ea5 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -13,7 +13,9 @@
#include "exec/gdbstub.h"
#include "helper.h"
#include "qemu/host-utils.h"
+#ifndef CONFIG_USER_ONLY
#include "ui/console.h"
+#endif
#undef DEBUG_UC32