From 9c7a420265c24b5917314d3976db8ca940642254 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Tue, 17 Nov 2009 20:52:56 +0000 Subject: Prevent configuring for a user emulator on a different type of OS Signed-off-by: Blue Swirl --- configure | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 73f8b7bb5..a49aaef32 100755 --- a/configure +++ b/configure @@ -2172,14 +2172,26 @@ case "$target" in target_softmmu="yes" ;; ${target_arch2}-linux-user) + if test "$linux" != "yes" ; then + echo "ERROR: Target '$target' is only available on a Linux host" + exit 1 + fi target_user_only="yes" target_linux_user="yes" ;; ${target_arch2}-darwin-user) + if test "$darwin" != "yes" ; then + echo "ERROR: Target '$target' is only available on a Darwin host" + exit 1 + fi target_user_only="yes" target_darwin_user="yes" ;; ${target_arch2}-bsd-user) + if test "bsd" != "yes" ; then + echo "ERROR: Target '$target' is only available on a BSD host" + exit 1 + fi target_user_only="yes" target_bsd_user="yes" ;; -- cgit v1.2.3-65-gdbad From 9cf55765b942c580d9db9dc3dc0b156d466e7ca8 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Tue, 17 Nov 2009 21:27:18 +0000 Subject: Fix typo Signed-off-by: Blue Swirl --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index a49aaef32..278966d6b 100755 --- a/configure +++ b/configure @@ -2188,7 +2188,7 @@ case "$target" in target_darwin_user="yes" ;; ${target_arch2}-bsd-user) - if test "bsd" != "yes" ; then + if test "$bsd" != "yes" ; then echo "ERROR: Target '$target' is only available on a BSD host" exit 1 fi -- cgit v1.2.3-65-gdbad From 493abda627c95d2a2f3bb3757eff527d226d2b38 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Mon, 16 Nov 2009 17:52:03 +0100 Subject: audio: link with -lpulse in addition to -lpulse-simple Link with -lpulse in addition to -lpulse-simple, needed when --no-add-needed is passed to the linker (gold default). Signed-off-by: Aurelien Jarno --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 278966d6b..e108dfb18 100755 --- a/configure +++ b/configure @@ -1165,9 +1165,9 @@ for drv in $audio_drv_list; do ;; pa) - audio_drv_probe $drv pulse/simple.h -lpulse-simple \ + audio_drv_probe $drv pulse/simple.h "-lpulse-simple -lpulse" \ "pa_simple *s = NULL; pa_simple_free(s); return 0;" - libs_softmmu="-lpulse-simple $libs_softmmu" + libs_softmmu="-lpulse -lpulse-simple $libs_softmmu" audio_pt_int="yes" ;; -- cgit v1.2.3-65-gdbad From 86355e0700e4bc238ef2d01271c9bbe5d59b2aea Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Wed, 18 Nov 2009 16:14:09 +0100 Subject: qemu-io: build on all platforms Since c32d766af127f68bb75ba5689f2f5239227bf559, qemu-io should be portable. It is currently built only on linux and mingw32. This patch enables qemu-io on all platforms. Tested on FreeBSD. Signed-off-by: Aurelien Jarno --- configure | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index e108dfb18..e314ac643 100755 --- a/configure +++ b/configure @@ -2087,15 +2087,13 @@ esac tools= if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then - tools="qemu-img\$(EXESUF) $tools" + tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" = "yes" ] ; then - tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools" + tools="qemu-nbd\$(EXESUF) $tools" if [ "$check_utests" = "yes" ]; then tools="check-qint check-qstring check-qdict check-qlist $tools" tools="check-qfloat check-qjson $tools" fi - elif test "$mingw32" = "yes" ; then - tools="qemu-io\$(EXESUF) $tools" fi fi echo "TOOLS=$tools" >> $config_host_mak -- cgit v1.2.3-65-gdbad From 3a3fb96d0d9e3331e3beb672108ec18a6d3d8c1c Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 16 Nov 2009 19:59:18 +0100 Subject: configure: Fix spelling in comment and rework the comment * Replace vill -> will. * Comment was formatted to make it more readable and to conform to the coding standard, too. * Description of foo="" was completed. Signed-off-by: Stefan Weil Signed-off-by: Aurelien Jarno --- configure | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'configure') diff --git a/configure b/configure index e314ac643..b65c11c72 100755 --- a/configure +++ b/configure @@ -169,15 +169,17 @@ case "$cpu" in ;; esac -# Default value for a variable defining feature "foo" -# * foo="no", feature will only be used if --enable-foo arg is given -# * foo="", feature will be searched for, and if found, will be used -# * foo="yes", this value vill only be set by --enable-foo flag. -# feature will searched for, if not found, configure exits with error +# Default value for a variable defining feature "foo". +# * foo="no" feature will only be used if --enable-foo arg is given +# * foo="" feature will be searched for, and if found, will be used +# unless --disable-foo is given +# * foo="yes" this value will only be set by --enable-foo flag. +# feature will searched for, +# if not found, configure exits with error # -# Always add --enable-foo and --disable-foo command line args. Distributions want -# to ensure that several features are compiled in, and it is impossible without a -# --enable-foo that exits if feature is not found +# Always add --enable-foo and --disable-foo command line args. +# Distributions want to ensure that several features are compiled in, and it +# is impossible without a --enable-foo that exits if a feature is not found. bluez="" brlapi="" -- cgit v1.2.3-65-gdbad