aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2019-04-24 13:00:41 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2019-05-03 00:15:37 +0200
commit7c57bdd82026ba03f3158bbcd841afde7c2dc43a (patch)
tree4ddb7c7ccbe33e6158ee4a9c4ae2f0a67e227bf4 /configure
parent816956014e92d04d458900d2b8815b5bf3ac5a4d (diff)
downloadqemu-7c57bdd82026ba03f3158bbcd841afde7c2dc43a.zip
qemu-7c57bdd82026ba03f3158bbcd841afde7c2dc43a.tar.gz
qemu-7c57bdd82026ba03f3158bbcd841afde7c2dc43a.tar.bz2
build-sys: move slirp as git submodule project
The slirp project is now hosted on freedesktop at: https://gitlab.freedesktop.org/slirp. The libslirp source was extracted from qemu/slirp filtered through clang-format (available in project tree). The qemu slirp directory can be swapped by a git submodule. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20190424110041.8175-3-marcandre.lureau@redhat.com> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 9 insertions, 2 deletions
diff --git a/configure b/configure
index 60719dd..c60a43d 100755
--- a/configure
+++ b/configure
@@ -1115,6 +1115,8 @@ for opt do
;;
--disable-slirp) slirp="no"
;;
+ --enable-slirp=git) slirp="git"
+ ;;
--enable-slirp=system) slirp="system"
;;
--disable-vde) vde="no"
@@ -5885,6 +5887,8 @@ case "$slirp" in
"" | yes)
if $pkg_config slirp; then
slirp=system
+ elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then
+ slirp=git
elif test -e "${source_path}/slirp/Makefile" ; then
slirp=internal
elif test -z "$slirp" ; then
@@ -5902,7 +5906,10 @@ case "$slirp" in
esac
case "$slirp" in
- internal)
+ git | internal)
+ if test "$slirp" = git; then
+ git_submodules="${git_submodules} slirp"
+ fi
mkdir -p slirp
slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src"
slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp"
@@ -6565,7 +6572,7 @@ if test "$slirp" != "no"; then
echo "SLIRP_CFLAGS=$slirp_cflags" >> $config_host_mak
echo "SLIRP_LIBS=$slirp_libs" >> $config_host_mak
fi
-if [ "$slirp" = "internal" ]; then
+if [ "$slirp" = "git" -o "$slirp" = "internal" ]; then
echo "config-host.h: subdir-slirp" >> $config_host_mak
fi
if test "$vde" = "yes" ; then