docs=""
fdt=""
netmap="no"
-pixman=""
sdl=""
sdlabi=""
virtfs=""
# 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"
arm|aarch64)
libseccomp_minver="2.2.3"
;;
- ppc|ppc64)
+ ppc|ppc64|s390x)
libseccomp_minver="2.3.0"
;;
*)
if test "$libseccomp_minver" != "" &&
$pkg_config --atleast-version=$libseccomp_minver libseccomp ; then
- libs_softmmu="$libs_softmmu $($pkg_config --libs libseccomp)"
- QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags libseccomp)"
+ seccomp_cflags="$($pkg_config --cflags libseccomp)"
+ seccomp_libs="$($pkg_config --libs libseccomp)"
seccomp="yes"
else
if test "$seccomp" = "yes" ; then
sdl_cflags="$sdl_cflags $x11_cflags"
sdl_libs="$sdl_libs $x11_libs"
fi
- libs_softmmu="$sdl_libs $libs_softmmu"
fi
##########################################
EOF
if compile_prog "" "$vde_libs" ; then
vde=yes
- libs_softmmu="$vde_libs $libs_softmmu"
- libs_tools="$vde_libs $libs_tools"
else
if test "$vde" = "yes" ; then
feature_not_found "vde" "Install vde (Virtual Distributed Ethernet) devel"
##########################################
# 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
##########################################
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"
fi
if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
+ echo "VDE_LIBS=$vde_libs" >> $config_host_mak
fi
if test "$netmap" = "yes" ; then
echo "CONFIG_NETMAP=y" >> $config_host_mak
echo "CONFIG_SDL=y" >> $config_host_mak
echo "CONFIG_SDLABI=$sdlabi" >> $config_host_mak
echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
+ echo "SDL_LIBS=$sdl_libs" >> $config_host_mak
fi
if test "$cocoa" = "yes" ; then
echo "CONFIG_COCOA=y" >> $config_host_mak
if test "$seccomp" = "yes"; then
echo "CONFIG_SECCOMP=y" >> $config_host_mak
+ echo "SECCOMP_CFLAGS=$seccomp_cflags" >> $config_host_mak
+ echo "SECCOMP_LIBS=$seccomp_libs" >> $config_host_mak
fi
# XXX: suppress that
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