[Qemu-devel] [PATCH] misc. typos

[Bernhard Fischer <rep.nop@aon.at>]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

Hi,

Attached three patchlets do:

1) qemu-helptext_typo.diff
s/sound cars/sound cards/

2) qemu-configure_help.diff
add --help and -h to the normal option parsing. This allows to give -h
anywhere in the arguments to configure (not only as first argument).

correct the configure help text for --host-cc

3) qemu-alsa_configure_check.diff
add configure check for alsa if it was requested.


Please apply.

cheers,
Bernhard

[-- Attachment #2: qemu-helptext_typo.diff --]
[-- Type: text/plain, Size: 666 bytes --]

diff -X excl -rduNp qemu.oorig/vl.c qemu/vl.c
--- qemu.oorig/vl.c	2005-11-27 21:13:53.000000000 +0100
+++ qemu/vl.c	2005-12-01 19:59:27.000000000 +0100
@@ -3774,7 +3774,7 @@ void help(void)
 	   "-k language     use keyboard layout (for example \"fr\" for French)\n"
 #endif
 #ifdef HAS_AUDIO
-           "-enable-audio   enable audio support, and all the sound cars\n"
+           "-enable-audio   enable audio support, and all the sound cards\n"
            "-audio-help     print list of audio drivers and their options\n"
            "-soundhw c1,... enable audio support\n"
            "                and only specified sound cards (comma separated list)\n"


[-- Attachment #3: qemu-configure_help.diff --]
[-- Type: text/plain, Size: 1229 bytes --]

diff -X excl -rduNp qemu.oorig/configure qemu/configure
--- qemu.oorig/configure	2005-11-26 20:04:12.000000000 +0100
+++ qemu/configure	2005-12-01 19:49:56.000000000 +0100
@@ -147,6 +148,8 @@ fi
 
 for opt do
   case "$opt" in
+  --help|-h) show_help=yes
+  ;;
   --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
   ;;
   --interp-prefix=*) interp_prefix=`echo $opt | cut -d '=' -f 2`
@@ -348,7 +377,7 @@ fi # sdl compile test
 fi # cross compilation
 fi # -z $sdl
 
-if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
+if test x"$show_help" = x"yes" ; then
 cat << EOF
 
 Usage: configure [options]
@@ -370,9 +399,9 @@ echo "Advanced options (experts only):"
 echo "  --source-path=PATH       path of source code [$source_path]"
 echo "  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]"
 echo "  --cc=CC                  use C compiler CC [$cc]"
-echo "  --host-cc=CC             use C compiler CC [$cc] for dyngen etc."
+echo "  --host-cc=CC             use C compiler CC [$host_cc] for dyngen etc."
 echo "  --make=MAKE              use specified make [$make]"
 echo "  --static                 enable static build [$static]"
 echo "  --enable-mingw32         enable Win32 cross compilation with mingw32"

[-- Attachment #4: qemu-alsa_configure_check.diff --]
[-- Type: text/plain, Size: 568 bytes --]

diff -X excl -rduNp qemu.oorig/configure qemu/configure
--- qemu.oorig/configure	2005-11-26 20:04:12.000000000 +0100
+++ qemu/configure	2005-12-01 19:49:56.000000000 +0100
@@ -445,6 +475,15 @@ fi # kqemu
 
 fi # kqemu and linux
 
+# sound support libraries
+# alsa
+if test "$alsa" = "yes" ; then
+    cat > $TMPC << EOF
+#include <alsa/asoundlib.h>
+int main(void) { snd_pcm_t **handle; return snd_pcm_close(*handle); }
+EOF
+    $cc -o $TMPE $TMPC -lasound 2> /dev/null || alsa="no"
+fi # alsa
 
 echo "Install prefix    $prefix"
 echo "BIOS directory    $datadir"