diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 44 |
1 files changed, 4 insertions, 40 deletions
@@ -287,7 +287,6 @@ curses="" docs="" fdt="" netmap="no" -pixman="" sdl="" sdlabi="" virtfs="" @@ -923,12 +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-system-pixman) pixman="internal" - ;; - --without-pixman) pixman="none" - ;; --disable-sdl) sdl="no" ;; --enable-sdl) sdl="yes" @@ -3295,39 +3288,15 @@ 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" - else - pixman="internal" - 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 - if test ! -d ${source_path}/pixman/pixman; then - error_exit "pixman >= 0.21.8 not present. Your options:" \ - " (1) Preferred: Install the pixman devel package (any recent" \ - " distro should have packages as Xorg needs pixman too)." \ - " (2) Fetch the pixman submodule, using:" \ - " git submodule update --init pixman" - fi - mkdir -p pixman/pixman - pixman_cflags="-I\$(SRC_PATH)/pixman/pixman -I\$(BUILD_DIR)/pixman/pixman" - pixman_libs="-L\$(BUILD_DIR)/pixman/pixman/.libs -lpixman-1" + error_exit "pixman >= 0.21.8 not present." \ + "Please install the pixman devel package." fi ########################################## @@ -5300,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" @@ -6522,10 +6490,6 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak done # for target in $targets -if [ "$pixman" = "internal" ]; then - echo "config-host.h: subdir-pixman" >> $config_host_mak -fi - if [ "$dtc_internal" = "yes" ]; then echo "config-host.h: subdir-dtc" >> $config_host_mak fi |