Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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>
  • Loading branch information...
commit 74880fe27d2120ab3861dc857ecd025db1a67038 1 parent 2915efb
Robert Schiele authored December 04, 2012 Anthony Liguori committed December 23, 2012
18  configure
@@ -656,6 +656,8 @@ for opt do
656 656
   ;;
657 657
   --without-system-pixman) pixman="internal"
658 658
   ;;
  659
+  --without-pixman) pixman="none"
  660
+  ;;
659 661
   --disable-sdl) sdl="no"
660 662
   ;;
661 663
   --enable-sdl) sdl="yes"
@@ -2130,13 +2132,25 @@ fi
2130 2132
 # pixman support probe
2131 2133
 
2132 2134
 if test "$pixman" = ""; then
2133  
-  if $pkg_config pixman-1 > /dev/null 2>&1; then
  2135
+  if test "$want_tools" = "no" -a "$softmmu" = "no"; then
  2136
+    pixman="none"
  2137
+  elif $pkg_config pixman-1 > /dev/null 2>&1; then
2134 2138
     pixman="system"
2135 2139
   else
2136 2140
     pixman="internal"
2137 2141
   fi
2138 2142
 fi
2139  
-if test "$pixman" = "system"; then
  2143
+if test "$pixman" = "none"; then
  2144
+  if test "$want_tools" != "no" -o "$softmmu" != "no"; then
  2145
+    echo "ERROR: pixman disabled but system emulation or tools build"
  2146
+    echo "       enabled.  You can turn off pixman only if you also"
  2147
+    echo "       disable all system emulation targets and the tools"
  2148
+    echo "       build with '--disable-tools --disable-system'."
  2149
+    exit 1
  2150
+  fi
  2151
+  pixman_cflags=
  2152
+  pixman_libs=
  2153
+elif test "$pixman" = "system"; then
2140 2154
   pixman_cflags=`$pkg_config --cflags pixman-1 2>/dev/null`
2141 2155
   pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null`
2142 2156
 else
2  target-unicore32/helper.c
@@ -13,7 +13,9 @@
13 13
 #include "exec/gdbstub.h"
14 14
 #include "helper.h"
15 15
 #include "qemu/host-utils.h"
  16
+#ifndef CONFIG_USER_ONLY
16 17
 #include "ui/console.h"
  18
+#endif
17 19
 
18 20
 #undef DEBUG_UC32
19 21
 

0 notes on commit 74880fe

Please sign in to comment.
Something went wrong with that request. Please try again.