X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=configure;h=5c62c594ec75273aa5d14c457e0c538cbbd82bd3;hb=9d479c119b42b8a548f8d79a8e5a1c1ce2932d91;hp=ec4b229f5099e068bfa61e0efaa0b5ddaa4561a4;hpb=fc9902d9c7793a5b854df126a059cce14ecc29f3;p=qemu diff --git a/configure b/configure index ec4b229..5c62c59 100755 --- a/configure +++ b/configure @@ -27,13 +27,77 @@ static="no" cross_prefix="" cc="gcc" audio_drv_list="" -audio_card_list="" +audio_card_list="ac97 es1370 sb16" +audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus" host_cc="gcc" ar="ar" make="make" install="install" strip="strip" -cpu=`test $(uname -s) = AIX && uname -p || uname -m` + +# parse CC options first +for opt do + optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'` + case "$opt" in + --cross-prefix=*) cross_prefix="$optarg" + ;; + --cc=*) cc="$optarg" + ;; + esac +done + +# OS specific +# Using uname is really, really broken. Once we have the right set of checks +# we can eliminate it's usage altogether + +cc="${cross_prefix}${cc}" +ar="${cross_prefix}${ar}" +strip="${cross_prefix}${strip}" + +# check that the C compiler works. +cat > $TMPC < /dev/null 2> /dev/null ; then + : C compiler works ok +else + echo "ERROR: \"$cc\" either does not exist or does not work" + exit 1 +fi + +check_define() { +cat > $TMPC < /dev/null 2> /dev/null +} + +if check_define __i386__ ; then + cpu="i386" +elif check_define __x86_64__ ; then + cpu="x86_64" +elif check_define __sparc__ ; then + # We can't check for 64 bit (when gcc is biarch) or V8PLUSA + # They must be specified using --sparc_cpu + if check_define __arch64__ ; then + cpu="sparc64" + else + cpu="sparc" + fi +elif check_define _ARCH_PPC ; then + if check_define _ARCH_PPC64 ; then + cpu="ppc64" + else + cpu="ppc" + fi +else + cpu=`uname -m` +fi + target_list="" case "$cpu" in i386|i486|i586|i686|i86pc|BePC) @@ -69,8 +133,11 @@ case "$cpu" in mips64) cpu="mips64" ;; - "Power Macintosh"|ppc|ppc64|powerpc) - cpu="powerpc" + ppc) + cpu="ppc" + ;; + ppc64) + cpu="ppc64" ;; s390*) cpu="s390" @@ -97,6 +164,7 @@ fmod_lib="" fmod_inc="" oss_lib="" vnc_tls="yes" +vnc_sasl="yes" bsd="no" linux="no" solaris="no" @@ -120,9 +188,16 @@ kerneldir="" aix="no" blobs="yes" fdt="yes" +sdl_x11="no" # OS specific -targetos=`uname -s` +if check_define __linux__ ; then + targetos="Linux" +elif check_define _WIN32 ; then + targetos='MINGW32' +else + targetos=`uname -s` +fi case $targetos in CYGWIN*) mingw32="yes" @@ -154,6 +229,15 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then kqemu="yes" fi ;; +DragonFly) +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" +;; NetBSD) bsd="yes" audio_drv_list="oss" @@ -170,11 +254,21 @@ 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 + is_x86_64=`sysctl -n hw.optional.x86_64` + [ "$is_x86_64" = "1" ] && cpu=x86_64 +fi +if [ "$cpu" = "x86_64" ] ; then + OS_CFLAGS="-arch x86_64" + LDFLAGS="-arch x86_64" +else + OS_CFLAGS="-mdynamic-no-pic" +fi darwin_user="yes" cocoa="yes" audio_drv_list="coreaudio" audio_possible_drivers="coreaudio sdl fmod" -OS_CFLAGS="-mdynamic-no-pic" OS_LDFLAGS="-framework CoreFoundation -framework IOKit" ;; SunOS) @@ -264,9 +358,9 @@ for opt do --source-path=*) source_path="$optarg" source_path_used="yes" ;; - --cross-prefix=*) cross_prefix="$optarg" + --cross-prefix=*) ;; - --cc=*) cc="$optarg" + --cc=*) ;; --host-cc=*) host_cc="$optarg" ;; @@ -304,6 +398,8 @@ for opt do ;; --disable-vnc-tls) vnc_tls="no" ;; + --disable-vnc-sasl) vnc_sasl="no" + ;; --disable-slirp) slirp="no" ;; --disable-vde) vde="no" @@ -456,11 +552,12 @@ echo " --disable-sdl disable SDL" echo " --enable-cocoa enable COCOA (Mac OS X only)" echo " --audio-drv-list=LIST set audio drivers list:" echo " Available drivers: $audio_possible_drivers" -echo " --audio-card-list=LIST set list of additional emulated audio cards" -echo " Available cards: ac97 adlib cs4231a gus" +echo " --audio-card-list=LIST set list of emulated audio cards [$audio_card_list]" +echo " Available cards: $audio_possible_cards" echo " --enable-mixemu enable mixer emulation" echo " --disable-brlapi disable BrlAPI" echo " --disable-vnc-tls disable TLS encryption for VNC server" +echo " --disable-vnc-sasl disable SASL encryption for VNC server" echo " --disable-curses disable curses output" echo " --disable-bluez disable bluez stack connectivity" echo " --disable-kvm disable KVM acceleration support" @@ -487,41 +584,13 @@ echo "NOTE: The object files are built at the place where configure is launched" exit 1 fi -cc="${cross_prefix}${cc}" -ar="${cross_prefix}${ar}" -strip="${cross_prefix}${strip}" - -# check that the C compiler works. -cat > $TMPC < /dev/null 2> /dev/null ; then - : C compiler works ok -else - echo "ERROR: \"$cc\" either does not exist or does not work" - exit 1 -fi - -# check compiler to see if we're on mingw32 -cat > $TMPC < -#ifndef _WIN32 -#error not windows -#endif -int main(void) {} -EOF - -if $cc $ARCH_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null ; then - mingw32="yes" -fi - if test "$mingw32" = "yes" ; then linux="no" EXESUF=".exe" oss="no" linux_user="no" bsd_user="no" + OS_CFLAGS="$OS_CFLAGS -DWIN32_LEAN_AND_MEAN -DWINVER=0x501" fi if test ! -x "$(which cgcc 2>/dev/null)"; then @@ -601,7 +670,7 @@ sparc32plus-linux-user \ fi # the following are Darwin specific if [ "$darwin_user" = "yes" ] ; then - target_list="$target_list i386-darwin-user ppc-darwin-user" + target_list="$target_list i386-darwin-user ppc-darwin-user " fi # the following are BSD specific if [ "$bsd_user" = "yes" ] ; then @@ -643,7 +712,8 @@ if test "$cpu" = "armv4b" \ -o "$cpu" = "m68k" \ -o "$cpu" = "mips" \ -o "$cpu" = "mips64" \ - -o "$cpu" = "powerpc" \ + -o "$cpu" = "ppc" \ + -o "$cpu" = "ppc64" \ -o "$cpu" = "s390" \ -o "$cpu" = "sparc" \ -o "$cpu" = "sparc64"; then @@ -657,26 +727,11 @@ hostlongbits="32" if test "$cpu" = "x86_64" \ -o "$cpu" = "alpha" \ -o "$cpu" = "ia64" \ - -o "$cpu" = "sparc64"; then + -o "$cpu" = "sparc64" \ + -o "$cpu" = "ppc64"; then hostlongbits="64" fi -# ppc specific hostlongbits selection -if test "$cpu" = "powerpc" ; then - if $cc $ARCH_CFLAGS -dM -E - -o $TMPI 2>/dev/null $TMPC < $TMPC < @@ -759,6 +814,21 @@ else fi fi # -z $sdl +if test "$sdl" = "yes" ; then +cat > $TMPC < +#if defined(SDL_VIDEO_DRIVER_X11) +#include +#else +#error No x11 support +#endif +int main(void) { return 0; } +EOF + if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` > /dev/null 2>&1 ; then + sdl_x11="yes" + fi +fi + ########################################## # VNC TLS detection if test "$vnc_tls" = "yes" ; then @@ -777,6 +847,40 @@ EOF fi ########################################## +# VNC SASL detection +if test "$vnc_sasl" = "yes" ; then +cat > $TMPC < +#include +int main(void) { sasl_server_init(NULL, "qemu"); return 0; } +EOF + # Assuming Cyrus-SASL installed in /usr prefix + vnc_sasl_cflags="" + vnc_sasl_libs="-lsasl2" + if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_sasl_cflags $TMPC \ + $vnc_sasl_libs 2> /dev/null ; then + : + else + vnc_sasl="no" + fi +fi + +########################################## +# fnmatch() probe, used for ACL routines +fnmatch="no" +cat > $TMPC << EOF +#include +int main(void) +{ + fnmatch("foo", "foo", 0); + return 0; +} +EOF +if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then + fnmatch="yes" +fi + +########################################## # vde libraries probe if test "$vde" = "yes" ; then cat > $TMPC << EOF @@ -917,18 +1021,30 @@ fi if test "$kvm" = "yes" ; then cat > $TMPC < -#if !defined(KVM_API_VERSION) || \ - KVM_API_VERSION < 12 || \ - KVM_API_VERSION > 12 || \ - !defined(KVM_CAP_USER_MEMORY) || \ - !defined(KVM_CAP_SET_TSS_ADDR) || \ - !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS) +#if !defined(KVM_API_VERSION) || KVM_API_VERSION < 12 || KVM_API_VERSION > 12 #error Invalid KVM version #endif +#if !defined(KVM_CAP_USER_MEMORY) +#error Missing KVM capability KVM_CAP_USER_MEMORY +#endif +#if !defined(KVM_CAP_SET_TSS_ADDR) +#error Missing KVM capability KVM_CAP_SET_TSS_ADDR +#endif +#if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS) +#error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS +#endif int main(void) { return 0; } EOF if test "$kerneldir" != "" ; then kvm_cflags=-I"$kerneldir"/include + if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) \ + -a -d "$kerneldir/arch/x86/include" ; then + kvm_cflags="$kvm_cflags -I$kerneldir/arch/x86/include" + elif test "$cpu" = "ppc" -a -d "$kerneldir/arch/powerpc/include" ; then + kvm_cflags="$kvm_cflags -I$kerneldir/arch/powerpc/include" + elif test -d "$kerneldir/arch/$cpu/include" ; then + kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include" + fi else kvm_cflags="" fi @@ -936,7 +1052,16 @@ EOF > /dev/null 2>/dev/null ; then : else - kvm="no" + kvm="no"; + if [ -x "`which awk 2>/dev/null`" ] && \ + [ -x "`which grep 2>/dev/null`" ]; then + kvmerr=`LANG=C $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $kvm_cflags $TMPC 2>&1 \ + | grep "error: " \ + | awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'` + if test "$kvmerr" != "" ; then + kvm="no - (${kvmerr})" + fi + fi fi fi @@ -948,7 +1073,7 @@ if test "$aio" = "yes" ; then aio=no cat > $TMPC << EOF #include -int main(void) { pthread_mutex_t lock; return 0; } +int main(void) { pthread_mutex_t lock; return 0; } EOF if $cc $ARCH_CFLAGS -o $TMPE $AIOLIBS $TMPC 2> /dev/null ; then aio=yes @@ -959,7 +1084,9 @@ fi ########################################## # iovec probe cat > $TMPC < #include +#include int main(void) { struct iovec iov; return 0; } EOF iovec=no @@ -1061,6 +1188,11 @@ if test "$vnc_tls" = "yes" ; then echo " TLS CFLAGS $vnc_tls_cflags" echo " TLS LIBS $vnc_tls_libs" fi +echo "VNC SASL support $vnc_sasl" +if test "$vnc_sasl" = "yes" ; then + echo " SASL CFLAGS $vnc_sasl_cflags" + echo " SASL LIBS $vnc_sasl_libs" +fi if test -n "$sparc_cpu"; then echo "Target Sparc Arch $sparc_cpu" fi @@ -1167,14 +1299,13 @@ case "$cpu" in echo "ARCH=mips64" >> $config_mak echo "#define HOST_MIPS64 1" >> $config_h ;; - powerpc) - if test "$hostlongbits" = "32"; then - echo "ARCH=ppc" >> $config_mak - echo "#define HOST_PPC 1" >> $config_h - else - echo "ARCH=ppc64" >> $config_mak - echo "#define HOST_PPC64 1" >> $config_h - fi + ppc) + echo "ARCH=ppc" >> $config_mak + echo "#define HOST_PPC 1" >> $config_h + ;; + ppc64) + echo "ARCH=ppc64" >> $config_mak + echo "#define HOST_PPC64 1" >> $config_h ;; s390) echo "ARCH=s390" >> $config_mak @@ -1303,6 +1434,15 @@ if test "$vnc_tls" = "yes" ; then echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak echo "#define CONFIG_VNC_TLS 1" >> $config_h fi +if test "$vnc_sasl" = "yes" ; then + echo "CONFIG_VNC_SASL=yes" >> $config_mak + echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak + echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak + echo "#define CONFIG_VNC_SASL 1" >> $config_h +fi +if test "$fnmatch" = "yes" ; then + echo "#define HAVE_FNMATCH_H 1" >> $config_h +fi qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_mak echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h @@ -1325,6 +1465,8 @@ if test "$sdl1" = "yes" ; then echo "CONFIG_SDL=yes" >> $config_mak if test "$target_softmmu" = "no" -o "$static" = "yes"; then echo "SDL_LIBS=$sdl_static_libs" >> $config_mak + elif test "$sdl_x11" = "yes" ; then + echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_mak else echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak fi @@ -1373,7 +1515,7 @@ fi if [ "$bsd" = "yes" ] ; then echo "#define O_LARGEFILE 0" >> $config_h echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h - echo "#define _BSD 1" >> $config_h + echo "#define HOST_BSD 1" >> $config_h fi echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h @@ -1491,7 +1633,7 @@ gdb_xml_files="" # Make sure the target and host cpus are compatible if test "$kvm" = "yes" -a ! \( "$target_cpu" = "$cpu" -o \ - \( "$target_cpu" = "ppcemb" -a "$cpu" = "powerpc" \) -o \ + \( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \ \( "$target_cpu" = "x86_64" -a "$cpu" = "i386" \) -o \ \( "$target_cpu" = "i386" -a "$cpu" = "x86_64" \) \) ; then kvm="no" @@ -1548,6 +1690,7 @@ case "$target_cpu" in echo "TARGET_ARCH=cris" >> $config_mak echo "#define TARGET_ARCH \"cris\"" >> $config_h echo "#define TARGET_CRIS 1" >> $config_h + target_nptl="yes" ;; m68k) echo "TARGET_ARCH=m68k" >> $config_mak @@ -1579,6 +1722,7 @@ case "$target_cpu" in echo "TARGET_ARCH=ppc" >> $config_mak echo "#define TARGET_ARCH \"ppc\"" >> $config_h echo "#define TARGET_PPC 1" >> $config_h + gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" ;; ppcemb) echo "TARGET_ARCH=ppcemb" >> $config_mak @@ -1591,6 +1735,7 @@ case "$target_cpu" in echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak echo "#define CONFIG_KVM 1" >> $config_h fi + gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" ;; ppc64) echo "TARGET_ARCH=ppc64" >> $config_mak @@ -1598,6 +1743,7 @@ case "$target_cpu" in echo "#define TARGET_ARCH \"ppc64\"" >> $config_h echo "#define TARGET_PPC 1" >> $config_h echo "#define TARGET_PPC64 1" >> $config_h + gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" ;; ppc64abi32) echo "TARGET_ARCH=ppc64" >> $config_mak @@ -1607,6 +1753,7 @@ case "$target_cpu" in echo "#define TARGET_PPC 1" >> $config_h echo "#define TARGET_PPC64 1" >> $config_h echo "#define TARGET_ABI32 1" >> $config_h + gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" ;; sh4|sh4eb) echo "TARGET_ARCH=sh4" >> $config_mak