From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EhuJg-00084s-Df for qemu-devel@nongnu.org; Thu, 01 Dec 2005 14:42:04 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EhuJK-0007sl-SL for qemu-devel@nongnu.org; Thu, 01 Dec 2005 14:42:03 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EhuJK-0007sf-OJ for qemu-devel@nongnu.org; Thu, 01 Dec 2005 14:41:42 -0500 Received: from [195.3.96.112] (helo=email.aon.at) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EhuJD-0005fn-P9 for qemu-devel@nongnu.org; Thu, 01 Dec 2005 14:41:37 -0500 Received: from m997p000.adsl.highway.telekom.at (HELO s37.loc) ([62.47.156.128]) (envelope-sender ) by smarthub72.highway.telekom.at (qmail-ldap-1.03) with SMTP for ; 1 Dec 2005 19:41:30 -0000 Received: from cow by s37.loc with local (Exim 4.54) id 1EhuL0-00071h-2h for qemu-devel@nongnu.org; Thu, 01 Dec 2005 20:43:26 +0100 Date: Thu, 1 Dec 2005 20:43:26 +0100 From: Bernhard Fischer Message-ID: <20051201194325.GG7230@aon.at> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="FFoLq8A0u+X9iRU8" Content-Disposition: inline Subject: [Qemu-devel] [PATCH] misc. typos Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --FFoLq8A0u+X9iRU8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --FFoLq8A0u+X9iRU8 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="qemu-helptext_typo.diff" 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" --FFoLq8A0u+X9iRU8 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="qemu-configure_help.diff" 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" --FFoLq8A0u+X9iRU8 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="qemu-alsa_configure_check.diff" 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 +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" --FFoLq8A0u+X9iRU8--