From patchwork Mon Aug 3 12:46:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30526 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 301AFB707B for ; Mon, 3 Aug 2009 23:37:22 +1000 (EST) Received: from localhost ([127.0.0.1]:60698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXxj5-0002En-3x for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 09:37:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwz3-0003Gs-Qy for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwyy-0003By-JQ for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:44 -0400 Received: from [199.232.76.173] (port=51670 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwyx-0003BS-RH for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:40 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40785) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwyx-0006xA-66 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:39 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cncei006475; Mon, 3 Aug 2009 08:49:38 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73CnaOe026054; Mon, 3 Aug 2009 08:49:37 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8MQ009715; Mon, 3 Aug 2009 08:49:35 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:13 +0200 Message-Id: <49e3d817551595ea47ceb582d5b4f928f7f95db7.1249301360.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 22/81] reindent Operating System selection configure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- configure | 164 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 83 insertions(+), 81 deletions(-) diff --git a/configure b/configure index 809f8e5..c78eda1 100755 --- a/configure +++ b/configure @@ -220,121 +220,123 @@ elif check_define __sun__ ; then else targetos=`uname -s` fi + case $targetos in CYGWIN*) -mingw32="yes" -CFLAGS="-mno-cygwin $CFLAGS" -audio_possible_drivers="sdl" + mingw32="yes" + CFLAGS="-mno-cygwin $CFLAGS" + audio_possible_drivers="sdl" ;; MINGW32*) -mingw32="yes" -audio_possible_drivers="dsound sdl fmod" + mingw32="yes" + audio_possible_drivers="dsound sdl fmod" ;; GNU/kFreeBSD) -audio_drv_list="oss" -audio_possible_drivers="oss sdl esd pa" -if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then + audio_drv_list="oss" + audio_possible_drivers="oss sdl esd pa" + if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then kqemu="yes" -fi + fi ;; FreeBSD) -bsd="yes" -audio_drv_list="oss" -audio_possible_drivers="oss sdl esd pa" -if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then + bsd="yes" + audio_drv_list="oss" + audio_possible_drivers="oss sdl esd pa" + if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then kqemu="yes" -fi + fi ;; DragonFly) -bsd="yes" -audio_drv_list="oss" -audio_possible_drivers="oss sdl esd pa" -if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then + bsd="yes" + audio_drv_list="oss" + audio_possible_drivers="oss sdl esd pa" + if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then kqemu="yes" -fi -aio="no" + fi + aio="no" ;; NetBSD) -bsd="yes" -audio_drv_list="oss" -audio_possible_drivers="oss sdl esd" -oss_lib="-lossaudio" + bsd="yes" + audio_drv_list="oss" + audio_possible_drivers="oss sdl esd" + oss_lib="-lossaudio" ;; OpenBSD) -bsd="yes" -audio_drv_list="oss" -audio_possible_drivers="oss sdl esd" -oss_lib="-lossaudio" + bsd="yes" + audio_drv_list="oss" + audio_possible_drivers="oss sdl esd" + oss_lib="-lossaudio" ;; Darwin) -bsd="yes" -darwin="yes" -# on Leopard most of the system is 32-bit, so we have to ask the kernel it if we can run 64-bit userspace code -if [ "$cpu" = "i386" ] ; then + bsd="yes" + darwin="yes" + # on Leopard most of the system is 32-bit, so we have to ask the kernel it if we can + # run 64-bit userspace code + if [ "$cpu" = "i386" ] ; then is_x86_64=`sysctl -n hw.optional.x86_64` [ "$is_x86_64" = "1" ] && cpu=x86_64 -fi -if [ "$cpu" = "x86_64" ] ; then + fi + if [ "$cpu" = "x86_64" ] ; then CFLAGS="-arch x86_64 $CFLAGS" LDFLAGS="-arch x86_64 $LDFLAGS" -else + else CFLAGS="-mdynamic-no-pic $CFLAGS" -fi -darwin_user="yes" -cocoa="yes" -audio_drv_list="coreaudio" -audio_possible_drivers="coreaudio sdl fmod" -LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS" + fi + darwin_user="yes" + cocoa="yes" + audio_drv_list="coreaudio" + audio_possible_drivers="coreaudio sdl fmod" + LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS" ;; SunOS) - solaris="yes" - make="gmake" - install="ginstall" - needs_libsunmath="no" - solarisrev=`uname -r | cut -f2 -d.` - # have to select again, because `uname -m` returns i86pc - # even on an x86_64 box. - solariscpu=`isainfo -k` - if test "${solariscpu}" = "amd64" ; then - cpu="x86_64" - fi - if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then - if test "$solarisrev" -le 9 ; then - if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then - needs_libsunmath="yes" - else - echo "QEMU will not link correctly on Solaris 8/X86 or 9/x86 without" - echo "libsunmath from the Sun Studio compilers tools, due to a lack of" - echo "C99 math features in libm.so in Solaris 8/x86 and Solaris 9/x86" - echo "Studio 11 can be downloaded from www.sun.com." - exit 1 - fi - fi - if test "$solarisrev" -ge 9 ; then - kqemu="yes" - fi + solaris="yes" + make="gmake" + install="ginstall" + needs_libsunmath="no" + solarisrev=`uname -r | cut -f2 -d.` + # have to select again, because `uname -m` returns i86pc + # even on an x86_64 box. + solariscpu=`isainfo -k` + if test "${solariscpu}" = "amd64" ; then + cpu="x86_64" + fi + if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then + if test "$solarisrev" -le 9 ; then + if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then + needs_libsunmath="yes" + else + echo "QEMU will not link correctly on Solaris 8/X86 or 9/x86 without" + echo "libsunmath from the Sun Studio compilers tools, due to a lack of" + echo "C99 math features in libm.so in Solaris 8/x86 and Solaris 9/x86" + echo "Studio 11 can be downloaded from www.sun.com." + exit 1 + fi fi - if test -f /usr/include/sys/soundcard.h ; then - audio_drv_list="oss" + if test "$solarisrev" -ge 9 ; then + kqemu="yes" fi - audio_possible_drivers="oss sdl" - CFLAGS="-std=gnu99 $CFLAGS" + fi + if test -f /usr/include/sys/soundcard.h ; then + audio_drv_list="oss" + fi + audio_possible_drivers="oss sdl" + CFLAGS="-std=gnu99 $CFLAGS" ;; AIX) -aix="yes" -make="gmake" + aix="yes" + make="gmake" ;; *) -audio_drv_list="oss" -audio_possible_drivers="oss alsa sdl esd pa" -linux="yes" -linux_user="yes" -usb="linux" -kvm="yes" -if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then + audio_drv_list="oss" + audio_possible_drivers="oss alsa sdl esd pa" + linux="yes" + linux_user="yes" + usb="linux" + kvm="yes" + if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then kqemu="yes" audio_possible_drivers="$audio_possible_drivers fmod" -fi + fi ;; esac