diff options
| author | Gerd Hoffmann | 2017-09-05 16:01:15 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2017-09-13 10:15:43 +0200 |
| commit | c12b6d70e384c769ca372e15ffd19b3e9f563662 (patch) | |
| tree | ab0e37d52b4184c73710b2ebfdaa15767a948aea /configure | |
| parent | Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-signed' int... (diff) | |
| download | qemu-c12b6d70e384c769ca372e15ffd19b3e9f563662.tar.gz qemu-c12b6d70e384c769ca372e15ffd19b3e9f563662.tar.xz qemu-c12b6d70e384c769ca372e15ffd19b3e9f563662.zip | |
pixman: drop submodule
Drop pixman submodule and support for the "internal" pixman build.
pixman should be reasonably well established meanwhile so we don't
need the fallback submodule any more. While being at it also drop
some #ifdefs for pixman versions older than what we require in
configure anyway.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20170905140116.28181-2-kraxel@redhat.com
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 2 insertions, 18 deletions
@@ -925,8 +925,6 @@ for opt do ;; --with-system-pixman) pixman="system" ;; - --without-system-pixman) pixman="internal" - ;; --without-pixman) pixman="none" ;; --disable-sdl) sdl="no" @@ -3300,8 +3298,6 @@ if test "$pixman" = ""; 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 @@ -3318,16 +3314,8 @@ elif test "$pixman" = "system"; 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 ########################################## @@ -6529,10 +6517,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 |