diff options
| -rwxr-xr-x | configure | 24 |
1 files changed, 2 insertions, 22 deletions
@@ -287,7 +287,6 @@ curses="" docs="" fdt="" netmap="no" -pixman="" sdl="" sdlabi="" virtfs="" @@ -923,10 +922,6 @@ for opt do # configure to be used by RPM and similar macros that set # lots of directory switches by default. ;; - --with-system-pixman) pixman="system" - ;; - --without-pixman) pixman="none" - ;; --disable-sdl) sdl="no" ;; --enable-sdl) sdl="yes" @@ -3293,24 +3288,10 @@ fi ########################################## # pixman support probe -if test "$pixman" = ""; then - if test "$want_tools" = "no" -a "$softmmu" = "no"; then - pixman="none" - elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then - pixman="system" - fi -fi -if test "$pixman" = "none"; then - if test "$want_tools" != "no" -o "$softmmu" != "no"; then - error_exit "pixman disabled but system emulation or tools build" \ - "enabled. You can turn off pixman only if you also" \ - "disable all system emulation targets and the tools" \ - "build with '--disable-tools --disable-system'." - fi +if test "$want_tools" = "no" -a "$softmmu" = "no"; then pixman_cflags= pixman_libs= -elif test "$pixman" = "system"; then - # pixman version has been checked above +elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then pixman_cflags=$($pkg_config --cflags pixman-1) pixman_libs=$($pkg_config --libs pixman-1) else @@ -5288,7 +5269,6 @@ echo "static build $static" if test "$darwin" = "yes" ; then echo "Cocoa support $cocoa" fi -echo "pixman $pixman" echo "SDL support $sdl $(echo_version $sdl $sdlversion)" echo "GTK support $gtk $(echo_version $gtk $gtk_version)" echo "GTK GL support $gtk_gl" |