do not set PORT_STAT_C_ENABLE when doing port reset (Lonnie Mendez)

[qemu] / configure

diff --git a/configure b/configure
index f315c19..120e03d 100755 (executable)
--- a/configure
+++ b/configure
@@ -25,6 +25,7 @@ cc="gcc"
 host_cc="gcc"
 ar="ar"
 make="make"
+install="install"
 strip="strip"
 cpu=`uname -m`
 target_list=""
@@ -93,6 +94,7 @@ check_gfx="yes"
 check_gcc="yes"
 softmmu="yes"
 user="no"
+build_docs="no"
 
 # OS specific
 targetos=`uname -s`
@@ -172,6 +174,8 @@ for opt do
   ;;
   --make=*) make="$optarg"
   ;;
+  --install=*) install="$optarg"
+  ;;
   --extra-cflags=*) CFLAGS="$optarg"
   ;;
   --extra-ldflags=*) LDFLAGS="$optarg"
@@ -256,6 +260,7 @@ 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 [$host_cc] for dyngen etc."
 echo "  --make=MAKE              use specified make [$make]"
+echo "  --install=INSTALL        use specified install [$install]"
 echo "  --static                 enable static build [$static]"
 echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
 echo "  --enable-mingw32         enable Win32 cross compilation with mingw32"
@@ -279,6 +284,11 @@ cc="${cross_prefix}${cc}"
 ar="${cross_prefix}${ar}"
 strip="${cross_prefix}${strip}"
 
+if [ -z `which $cc` ] ; then
+    echo "Compiler $cc could not be found"
+    exit
+fi
+
 if test "$mingw32" = "yes" ; then
     linux="no"
     EXESUF=".exe"
@@ -418,6 +428,11 @@ fi # sdl compile test
 fi # cross compilation
 fi # -z $sdl
 
+# Check if tools are available to build documentation.
+if [ ! -z `which texi2html` ] && [ ! -z `which pod2man` ]; then
+  build_docs="yes"
+fi
+
 if test "$mingw32" = "yes" ; then
 if test -z "$prefix" ; then
     prefix="/c/Program Files/Qemu"
@@ -447,6 +462,7 @@ echo "Source path       $source_path"
 echo "C compiler        $cc"
 echo "Host C compiler   $host_cc"
 echo "make              $make"
+echo "install           $install"
 echo "host CPU          $cpu"
 echo "host big endian   $bigendian"
 echo "target list       $target_list"
@@ -479,6 +495,7 @@ else
 fi
 echo "FMOD support      $fmod $fmod_support"
 echo "kqemu support     $kqemu"
+echo "Documentation     $build_docs"
 
 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -502,6 +519,7 @@ echo "datadir=$datadir" >> $config_mak
 echo "docdir=$docdir" >> $config_mak
 echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h
 echo "MAKE=$make" >> $config_mak
+echo "INSTALL=$install" >> $config_mak
 echo "CC=$cc" >> $config_mak
 if test "$have_gcc3_options" = "yes" ; then
   echo "HAVE_GCC3_OPTIONS=yes" >> $config_mak
@@ -614,13 +632,16 @@ if test "$fmod" = "yes" ; then
 fi
 qemu_version=`head $source_path/VERSION`
 echo "VERSION=$qemu_version" >>$config_mak
-echo "#define QEMU_VERSION $qemu_version" >> $config_h
+echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
 
 echo "SRC_PATH=$source_path" >> $config_mak
 if [ "$source_path_used" = "yes" ]; then
   echo "VPATH=$source_path" >> $config_mak
 fi
 echo "TARGET_DIRS=$target_list" >> $config_mak
+if [ "$build_docs" = "yes" ] ; then
+  echo "BUILD_DOCS=yes" >> $config_mak
+fi
 
 # XXX: suppress that
 if [ "$bsd" = "yes" ] ; then
@@ -653,7 +674,7 @@ fi
 if test "$target_user_only" = "no" -a "$check_gfx" = "yes" \
         -a "$sdl" = "no" -a "$cocoa" = "no" ; then
     echo "ERROR: QEMU requires SDL or Cocoa for graphical output"
-    echo "To build QEMU with graphical output configure with --disable-gfx-check"
+    echo "To build QEMU without graphical output configure with --disable-gfx-check"
     echo "Note that this will disable all output from the virtual graphics card."
     exit 1;
 fi