audio clean up (initial patch by malc)

[qemu.git] / configure

diff --git a/configure b/configure
index 2c8dddbc493f856417dd4db6c23aa028994bdbd7..9d45ab9dbf8b8bf260b6007f7227da57796d2f37 100755 (executable)
--- a/configure
+++ b/configure
@@ -27,7 +27,7 @@ ar="ar"
 make="make"
 strip="strip"
 cpu=`uname -m`
-target_list="i386-user i386 i386-softmmu arm-user sparc-user ppc-user ppc-softmmu"
+target_list="i386-user i386 i386-softmmu arm-user sparc-user ppc-user ppc-softmmu sparc-softmmu"
 case "$cpu" in
   i386|i486|i586|i686|i86pc|BePC)
     cpu="i386"
@@ -71,7 +71,9 @@ bigendian="no"
 mingw32="no"
 EXESUF=""
 gdbstub="yes"
-slirp="no"
+slirp="yes"
+adlib="no"
+oss="no"
 
 # OS specific
 targetos=`uname -s`
@@ -79,9 +81,34 @@ case $targetos in
 MINGW32*)
 mingw32="yes"
 ;;
-*) ;;
+FreeBSD)
+bsd="yes"
+oss="yes"
+;;
+NetBSD)
+bsd="yes"
+oss="yes"
+;;
+OpenBSD)
+bsd="yes"
+oss="yes"
+;;
+Darwin)
+bsd="yes"
+darwin="yes"
+;;
+*) 
+oss="yes"
+;;
 esac
 
+if [ "$bsd" = "yes" ] ; then
+  if [ ! "$darwin" = "yes" ] ; then
+    make="gmake"
+  fi
+  target_list="i386-softmmu ppc-softmmu sparc-softmmu"
+fi
+
 # find source path
 # XXX: we assume an absolute path is given when launching configure, 
 # except in './configure' case.
@@ -125,7 +152,9 @@ for opt do
   ;;
   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
   ;; 
-  --enable-slirp) slirp="yes"
+  --disable-slirp) slirp="no"
+  ;; 
+  --enable-adlib) adlib="yes"
   ;; 
   esac
 done
@@ -140,7 +169,7 @@ ar="${cross_prefix}${ar}"
 strip="${cross_prefix}${strip}"
 
 if test "$mingw32" = "yes" ; then
-    target_list="i386-softmmu"
+    target_list="i386-softmmu ppc-softmmu sparc-softmmu"
     EXESUF=".exe"
     gdbstub="no"
 fi
@@ -220,7 +249,7 @@ aa="no"
 `$sdl_config --static-libs | grep \\\-laa > /dev/null` && aa="yes"
 sdl_static_libs=`$sdl_config --static-libs`
 if [ "$aa" = "yes" ] ; then
-  sdl_static_libs="$sdl_static_libs `aalib-config --libs`"
+  sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
 fi
 
 if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
@@ -265,19 +294,21 @@ if test -z "$prefix" ; then
     prefix="/c/Program Files/Qemu"
 fi
 mandir="$prefix"
-sharedir="$prefix"
+datadir="$prefix"
+docdir="$prefix"
 bindir="$prefix"
 else
 if test -z "$prefix" ; then
     prefix="/usr/local"
 fi
 mandir="$prefix/share/man"
-sharedir="$prefix/share/qemu"
+datadir="$prefix/share/qemu"
+docdir="$prefix/share/doc/qemu"
 bindir="$prefix/bin"
 fi
 
 echo "Install prefix    $prefix"
-echo "BIOS directory    $sharedir"
+echo "BIOS directory    $datadir"
 echo "binary directory  $bindir"
 if test "$mingw32" = "no" ; then
 echo "Manual directory  $mandir"
@@ -294,6 +325,7 @@ echo "static build      $static"
 echo "SDL support       $sdl"
 echo "SDL static link   $sdl_static"
 echo "mingw32 support   $mingw32"
+echo "Adlib support     $adlib"
 
 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support"
@@ -313,8 +345,9 @@ echo "/* Automatically generated by configure - do not modify */" > $config_h
 echo "prefix=$prefix" >> $config_mak
 echo "bindir=$bindir" >> $config_mak
 echo "mandir=$mandir" >> $config_mak
-echo "sharedir=$sharedir" >> $config_mak
-echo "#define CONFIG_QEMU_SHAREDIR \"$sharedir\"" >> $config_h
+echo "datadir=$datadir" >> $config_mak
+echo "docdir=$docdir" >> $config_mak
+echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h
 echo "MAKE=$make" >> $config_mak
 echo "CC=$cc" >> $config_mak
 if test "$have_gcc3_options" = "yes" ; then
@@ -370,9 +403,13 @@ fi
 if test "$mingw32" = "yes" ; then
   echo "CONFIG_WIN32=yes" >> $config_mak
   echo "#define CONFIG_WIN32 1" >> $config_h
-else
+elif test -f "/usr/include/byteswap.h" ; then
   echo "#define HAVE_BYTESWAP_H 1" >> $config_h
 fi
+if test "$darwin" = "yes" ; then
+  echo "CONFIG_DARWIN=yes" >> $config_mak
+  echo "#define CONFIG_DARWIN 1" >> $config_h
+fi
 if test "$gdbstub" = "yes" ; then
   echo "CONFIG_GDBSTUB=yes" >> $config_mak
   echo "#define CONFIG_GDBSTUB 1" >> $config_h
@@ -389,6 +426,14 @@ if test "$slirp" = "yes" ; then
   echo "CONFIG_SLIRP=yes" >> $config_mak
   echo "#define CONFIG_SLIRP 1" >> $config_h
 fi
+if test "$adlib" = "yes" ; then
+  echo "CONFIG_ADLIB=yes" >> $config_mak
+  echo "#define CONFIG_ADLIB 1" >> $config_h
+fi
+if test "$oss" = "yes" ; then
+  echo "CONFIG_OSS=yes" >> $config_mak
+  echo "#define CONFIG_OSS 1" >> $config_h
+fi
 echo -n "VERSION=" >>$config_mak
 head $source_path/VERSION >>$config_mak
 echo "" >>$config_mak
@@ -399,6 +444,13 @@ echo "\"" >> $config_h
 echo "SRC_PATH=$source_path" >> $config_mak
 echo "TARGET_DIRS=$target_list" >> $config_mak
 
+# XXX: suppress that
+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
+fi
+
 for target in $target_list; do 
 
 target_dir="$target"
@@ -476,23 +528,24 @@ fi
 
 if test "$target_user_only" = "no"; then
     if test "$target_softmmu" = "no" -o "$static" = "yes"; then
-        if test "$sdl_static" = "yes" ; then
-            echo "#define CONFIG_SDL 1" >> $config_h
-            echo "CONFIG_SDL=yes" >> $config_mak
-            echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
-        fi
+        sdl1=$sdl_static
     else
-        if test "$sdl" = "yes" ; then
-            echo "#define CONFIG_SDL 1" >> $config_h
-            echo "CONFIG_SDL=yes" >> $config_mak
+        sdl1=$sdl
+    fi
+    if test "$sdl1" = "yes" ; then
+        echo "#define CONFIG_SDL 1" >> $config_h
+        echo "CONFIG_SDL=yes" >> $config_mak
+        if test "$target_softmmu" = "no" -o "$static" = "yes"; then
+            echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
+        else
             echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
         fi
+        echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
+        if [ "${aa}" = "yes" ] ; then
+            echo -n " `aalib-config --cflags`" >> $config_mak ;
+        fi
+        echo "" >> $config_mak
     fi
-    echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
-    if [ "${aa}" = "yes" ] ; then
-        echo -n " `aalib-config --cflags`" >> $config_mak ;
-    fi
-    echo "" >> $config_mak
 fi
 
 done # for target in $targets