This reverts commit d3bcc58f74b29df8496933c441640d9c739ba674.

Conflicts:

        configure (remove hardcoded alsa flag but keep qemu_opts)

Signed-off-by: Carlo Marcelo Arenas Belon <[EMAIL PROTECTED]>
---
 configure |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 715e12f..422c47e 100755
--- a/configure
+++ b/configure
@@ -6,7 +6,7 @@ want_module=1
 qemu_cc=
 qemu_cflags=
 qemu_ldflags=
-enable_alsa=
+qemu_opts=
 disable_gcc_check=
 cross_prefix=
 arch=`uname -m`
@@ -25,7 +25,6 @@ usage() {
            --qemu-cc=CC           specify compiler for qemu (must be gcc-3.x)
            --qemu-cflags=CFLAGS   CFLAGS to add to qemu configuration
            --qemu-ldflags=LDFLAGS LDFLAGS to add to qemu configuration
-           --enable-alsa          enable alsa support for qemu
            --disable-gcc-check    don't insist on gcc-3.x
                                   CAUTION: this will break running without kvm
 EOF
@@ -58,9 +57,6 @@ while [[ "$1" = -* ]]; do
        --qemu-ldflags)
            qemu_ldflags="$arg"
            ;;
-       --enable-alsa)
-           enable_alsa=1
-           ;;
        --disable-gcc-check)
            disable_gcc_check=1
            ;;
@@ -112,12 +108,11 @@ fi
     --extra-cflags="-I $PWD/../libkvm $qemu_cflags" \
     --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \
     --enable-kvm --kernel-path="$libkvm_kerneldir" \
-    ${enable_alsa:+"--enable-alsa"} \
     ${disable_gcc_check:+"--disable-gcc-check"} \
     --prefix="$prefix" \
     ${qemu_cc:+"--cc=$qemu_cc"} \
     ${cross_prefix:+"--cross-prefix=$cross_prefix"} \
-    ${cross_prefix:+"--cpu=$arch"}
+    ${cross_prefix:+"--cpu=$arch"} $qemu_opts
 )
 
 
-- 
1.5.3.7


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel

Reply via email to