pixman: drop configure switches
Remove pixman switches from configure, should not be needed any more,
configure can figure by itself whenever pixman is needed or not.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20170905140116.28181-3-kraxel@redhat.com
diff --git a/configure b/configure
index ee32ad0..7ea9cb3 100755
--- a/configure
+++ b/configure
@@ -287,7 +287,6 @@
docs=""
fdt=""
netmap="no"
-pixman=""
sdl=""
sdlabi=""
virtfs=""
@@ -923,10 +922,6 @@
# 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 @@
##########################################
# 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 @@
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"
