Revision e2134eb9

b/Makefile
118 118

  
119 119
subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
120 120

  
121
subdir-pixman: pixman/Makefile
122
	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)
123

  
124
pixman/Makefile: $(SRC_PATH)/pixman/configure
125
	(cd pixman; $(SRC_PATH)/pixman/configure --disable-shared --enable-static)
126

  
127
$(SRC_PATH)/pixman/configure:
128
	(cd $(SRC_PATH)/pixman; autoreconf -v --install)
129

  
121 130
$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) subdir-libdis
122 131

  
123 132
$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser
b/configure
147 147
docs=""
148 148
fdt=""
149 149
nptl=""
150
pixman=""
150 151
sdl=""
151 152
virtfs=""
152 153
vnc="yes"
......
642 643
    # configure to be used by RPM and similar macros that set
643 644
    # lots of directory switches by default.
644 645
  ;;
646
  --with-system-pixman) pixman="system"
647
  ;;
648
  --without-system-pixman) pixman="internal"
649
  ;;
645 650
  --disable-sdl) sdl="no"
646 651
  ;;
647 652
  --enable-sdl) sdl="yes"
......
2095 2100
fi
2096 2101

  
2097 2102
##########################################
2103
# pixman support probe
2104

  
2105
if test "$pixman" = ""; then
2106
  if $pkg_config pixman-1 > /dev/null 2>&1; then
2107
    pixman="system"
2108
  else
2109
    pixman="internal"
2110
  fi
2111
fi
2112
if test "$pixman" = "system"; then
2113
  pixman_cflags=`$pkg_config --cflags pixman-1 2>/dev/null`
2114
  pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null`
2115
else
2116
  if test ! -d ${source_path}/pixman/pixman; then
2117
    echo "ERROR: pixman not present. Your options:"
2118
    echo "  (1) Prefered: Install the pixman devel package (any recent"
2119
    echo "      distro should have packages as Xorg needs pixman too)."
2120
    echo "  (2) Fetch the pixman submodule, using:"
2121
    echo "      git submodule update --init pixman"
2122
    exit 1
2123
  fi
2124
  pixman_cflags="-I${source_path}/pixman/pixman"
2125
  pixman_libs="-Lpixman/pixman/.libs -lpixman-1"
2126
fi
2127
QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
2128
libs_softmmu="$libs_softmmu $pixman_libs"
2129

  
2130
##########################################
2098 2131
# libcap probe
2099 2132

  
2100 2133
if test "$cap" != "no" ; then
......
3142 3175
if test "$darwin" = "yes" ; then
3143 3176
    echo "Cocoa support     $cocoa"
3144 3177
fi
3178
echo "pixman            $pixman"
3145 3179
echo "SDL support       $sdl"
3146 3180
echo "curses support    $curses"
3147 3181
echo "curl support      $curl"
......
3908 3942
  if test "$smartcard_nss" = "yes" ; then
3909 3943
    echo "subdir-$target: subdir-libcacard" >> $config_host_mak
3910 3944
  fi
3945
  if test "$pixman" = "internal" ; then
3946
    echo "subdir-$target: subdir-pixman" >> $config_host_mak
3947
  fi
3911 3948
  case "$target_arch2" in
3912 3949
    i386|x86_64)
3913 3950
      echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
......
4111 4148
DIRS="$DIRS roms/seabios roms/vgabios"
4112 4149
DIRS="$DIRS qapi-generated"
4113 4150
DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
4151
DIRS="$DIRS pixman"
4114 4152
FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
4115 4153
FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
4116 4154
FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"

Also available in: Unified diff