OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pixman: drop configure switches

Browse Source 
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
This commit is contained in:
Gerd Hoffmann 2017-09-05 16:01:16 +02:00
parent c12b6d70e3
commit 35c4e86cf3
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure vendored
View File

@ -287,7 +287,6 @@ curses=""
docs="" docs=""
fdt="" fdt=""
netmap="no" netmap="no"
pixman=""
sdl="" sdl=""
sdlabi="" sdlabi=""
virtfs="" virtfs=""
@ -923,10 +922,6 @@ for opt do
# configure to be used by RPM and similar macros that set # configure to be used by RPM and similar macros that set
# lots of directory switches by default. # lots of directory switches by default.
;; ;;
--with-system-pixman) pixman="system"
;;
--without-pixman) pixman="none"
;;
--disable-sdl) sdl="no" --disable-sdl) sdl="no"
;; ;;
--enable-sdl) sdl="yes" --enable-sdl) sdl="yes"
@ -3293,24 +3288,10 @@ fi
########################################## ##########################################
# pixman support probe # pixman support probe
if test "$pixman" = ""; then if test "$want_tools" = "no" -a "$softmmu" = "no"; 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
pixman_cflags= pixman_cflags=
pixman_libs= pixman_libs=
elif test "$pixman" = "system"; then elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
# pixman version has been checked above
pixman_cflags=$($pkg_config --cflags pixman-1) pixman_cflags=$($pkg_config --cflags pixman-1)
pixman_libs=$($pkg_config --libs pixman-1) pixman_libs=$($pkg_config --libs pixman-1)
else else
@ -5288,7 +5269,6 @@ echo "static build $static"
if test "$darwin" = "yes" ; then if test "$darwin" = "yes" ; then
echo "Cocoa support $cocoa" echo "Cocoa support $cocoa"
fi fi
echo "pixman $pixman"
echo "SDL support $sdl $(echo_version $sdl $sdlversion)" echo "SDL support $sdl $(echo_version $sdl $sdlversion)"
echo "GTK support $gtk $(echo_version $gtk $gtk_version)" echo "GTK support $gtk $(echo_version $gtk $gtk_version)"
echo "GTK GL support $gtk_gl" echo "GTK GL support $gtk_gl"