win32 cross compile fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@694 c046a42c-6fe2-441c-8c8c-71466251a162
diff --git a/configure b/configure
index 75340ea..4f66317 100755
--- a/configure
+++ b/configure
@@ -17,7 +17,7 @@
TMPS="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.S"
# default parameters
-prefix="/usr/local"
+prefix=""
interp_prefix="/usr/gnemul/qemu-%M"
static="no"
cross_prefix=""
@@ -81,26 +81,6 @@
*) ;;
esac
-##########################################
-# SDL probe
-
-cat > $TMPC << EOF
-#include <SDL.h>
-#undef main /* We don't want SDL to override our main() */
-int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
-EOF
-
-sdl_too_old=no
-sdl=no
-if $cc -o $TMPE `sdl-config --cflags` $TMPC `sdl-config --libs` 2> /dev/null ; then
-_sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
-if test "$_sdlversion" -lt 121 ; then
-sdl_too_old=yes
-else
-sdl=yes
-fi
-fi
-
# find source path
# XXX: we assume an absolute path is given when launching configure,
# except in './configure' case.
@@ -157,9 +137,7 @@
strip="${cross_prefix}${strip}"
if test "$mingw32" = "yes" ; then
- host_cc="$cc"
target_list="i386-softmmu"
- prefix="/c/Program Files/Qemu"
EXESUF=".exe"
gdbstub="no"
fi
@@ -202,6 +180,31 @@
have_gcc3_options="yes"
fi
+##########################################
+# SDL probe
+
+sdl_too_old=no
+
+if test -z "$sdl" ; then
+
+cat > $TMPC << EOF
+#include <SDL.h>
+#undef main /* We don't want SDL to override our main() */
+int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
+EOF
+
+sdl=no
+if $cc -o $TMPE `sdl-config --cflags` $TMPC `sdl-config --libs` 2> /dev/null ; then
+_sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
+if test "$_sdlversion" -lt 121 ; then
+sdl_too_old=yes
+else
+sdl=yes
+fi
+fi
+
+fi
+
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
cat << EOF
@@ -228,13 +231,29 @@
exit 1
fi
+if test "$mingw32" = "yes" ; then
+if test -z "$prefix" ; then
+ prefix="/c/Program Files/Qemu"
+fi
+mandir="$prefix"
+sharedir="$prefix"
+bindir="$prefix"
+else
+if test -z "$prefix" ; then
+ prefix="/usr/local"
+fi
mandir="$prefix/share/man"
sharedir="$prefix/share/qemu"
+bindir="$prefix/bin"
+fi
echo "Install prefix $prefix"
-echo "Manual directory $mandir"
echo "BIOS directory $sharedir"
+echo "binary directory $bindir"
+if test "$mingw32" = "no" ; then
+echo "Manual directory $mandir"
echo "ELF interp prefix $interp_prefix"
+fi
echo "Source path $source_path"
echo "C compiler $cc"
echo "make $make"
@@ -259,6 +278,7 @@
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
@@ -316,6 +336,7 @@
fi
if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=yes" >> $config_mak
+ echo "#define CONFIG_WIN32 1" >> $config_h
else
echo "#define HAVE_BYTESWAP_H 1" >> $config_h
fi
