removed traces

[qemu] / configure

diff --git a/configure b/configure
index ef519c8..8e0cff8 100755 (executable)
--- a/configure
+++ b/configure
@@ -71,7 +71,7 @@ bigendian="no"
 mingw32="no"
 EXESUF=""
 gdbstub="yes"
-slirp="no"
+slirp="yes"
 
 # OS specific
 targetos=`uname -s`
@@ -79,9 +79,23 @@ case $targetos in
 MINGW32*)
 mingw32="yes"
 ;;
+FreeBSD)
+bsd="yes"
+;;
+NetBSD)
+bsd="yes"
+;;
+OpenBSD)
+bsd="yes"
+;;
 *) ;;
 esac
 
+if [ "$bsd" = "yes" ] ; then
+  make="gmake"
+  target_list="i386-softmmu"
+fi
+
 # find source path
 # XXX: we assume an absolute path is given when launching configure, 
 # except in './configure' case.
@@ -125,7 +139,7 @@ for opt do
   ;;
   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
   ;; 
-  --enable-slirp) slirp="yes"
+  --disable-slirp) slirp="no"
   ;; 
   esac
 done
@@ -140,9 +154,10 @@ ar="${cross_prefix}${ar}"
 strip="${cross_prefix}${strip}"
 
 if test "$mingw32" = "yes" ; then
-    target_list="i386-softmmu"
+    target_list="i386-softmmu ppc-softmmu"
     EXESUF=".exe"
     gdbstub="no"
+    slirp="no"
 fi
 
 if test -z "$cross_prefix" ; then
@@ -220,7 +235,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 +280,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"
@@ -313,8 +330,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,7 +388,7 @@ 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 "$gdbstub" = "yes" ; then
@@ -399,6 +417,14 @@ echo "\"" >> $config_h
 echo "SRC_PATH=$source_path" >> $config_mak
 echo "TARGET_DIRS=$target_list" >> $config_mak
 
+if [ "$bsd" = "yes" ] ; then
+  echo "#define O_LARGEFILE 0" >> $config_h
+  echo "#define lseek64 lseek" >> $config_h
+  echo "#define ftruncate64 ftruncate" >> $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"
@@ -423,6 +449,9 @@ mkdir -p $target_dir
 if test "$target" = "arm-user" ; then
   mkdir -p $target_dir/nwfpe
 fi
+if test "$target_user_only" = "no" ; then
+  mkdir -p $target_dir/slirp
+fi
 
 ln -sf $source_path/Makefile.target $target_dir/Makefile