X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=configure;h=8e0cff852330863e85f23e96de426824dccd320d;hb=514fb8c10e76fd861301719d14d6bae95125b54a;hp=2b830710a7ca495f93735c04baf7e10be2281962;hpb=97a847bc03d22bf5b0562af2407bc3516b3bfdd1;p=qemu diff --git a/configure b/configure index 2b83071..8e0cff8 100755 --- a/configure +++ b/configure @@ -17,8 +17,8 @@ TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}" TMPS="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.S" # default parameters -prefix="/usr/local" -interp_prefix="/usr/gnemul/qemu-i386" +prefix="" +interp_prefix="/usr/gnemul/qemu-%M" static="no" cross_prefix="" cc="gcc" @@ -27,7 +27,7 @@ ar="ar" make="make" strip="strip" cpu=`uname -m` -target_list="i386 i386-softmmu arm" +target_list="i386-user i386 i386-softmmu arm-user sparc-user ppc-user ppc-softmmu" case "$cpu" in i386|i486|i586|i686|i86pc|BePC) cpu="i386" @@ -56,37 +56,44 @@ case "$cpu" in ia64) cpu="ia64" ;; + m68k) + cpu="m68k" + ;; + x86_64|amd64) + cpu="amd64" + ;; *) cpu="unknown" ;; esac gprof="no" bigendian="no" +mingw32="no" +EXESUF="" +gdbstub="yes" +slirp="yes" # OS specific targetos=`uname -s` case $targetos in +MINGW32*) +mingw32="yes" +;; +FreeBSD) +bsd="yes" +;; +NetBSD) +bsd="yes" +;; +OpenBSD) +bsd="yes" +;; *) ;; esac -########################################## -# SDL probe - -cat > $TMPC << EOF -#include -#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 +if [ "$bsd" = "yes" ] ; then + make="gmake" + target_list="i386-softmmu" fi # find source path @@ -130,6 +137,10 @@ for opt do ;; --disable-sdl) sdl="no" ;; + --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" + ;; + --disable-slirp) slirp="no" + ;; esac done @@ -142,6 +153,13 @@ cc="${cross_prefix}${cc}" ar="${cross_prefix}${ar}" strip="${cross_prefix}${strip}" +if test "$mingw32" = "yes" ; then + target_list="i386-softmmu ppc-softmmu" + EXESUF=".exe" + gdbstub="no" + slirp="no" +fi + if test -z "$cross_prefix" ; then # --- @@ -163,7 +181,7 @@ fi else # if cross compiling, cannot launch a program, so make a static guess -if test "$cpu" = "powerpc" -o "$cpu" = "mips" -o "$cpu" = "s390" -o "$cpu" = "sparc" -o "$cpu" = "sparc64"; then +if test "$cpu" = "powerpc" -o "$cpu" = "mips" -o "$cpu" = "s390" -o "$cpu" = "sparc" -o "$cpu" = "sparc64" -o "$cpu" = "m68k"; then bigendian="yes" fi @@ -180,6 +198,57 @@ if $cc -fno-reorder-blocks -fno-optimize-sibling-calls -o $TMPO $TMPC 2> /dev/nu have_gcc3_options="yes" fi +########################################## +# SDL probe + +sdl_too_old=no + +if test -z "$sdl" ; then + +sdl_config="sdl-config" +sdl=no +sdl_static=no + +if test "$mingw32" = "yes" -a ! -z "$cross_prefix" ; then +# win32 cross compilation case + sdl_config="i386-mingw32msvc-sdl-config" + sdl=yes +else +# normal SDL probe +cat > $TMPC << EOF +#include +#undef main /* We don't want SDL to override our main() */ +int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } +EOF + +if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 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 + +# static link with sdl ? +if test "$sdl" = "yes" ; then +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 --static-libs`" +fi + +if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then + sdl_static=yes +fi + +fi # static link + +fi # sdl compile test + +fi # cross compilation +fi # -z $sdl + if test x"$1" = x"-h" -o x"$1" = x"--help" ; then cat << EOF @@ -190,7 +259,8 @@ EOF echo "Standard options:" echo " --help print this message" echo " --prefix=PREFIX install in PREFIX [$prefix]" -echo " --interp-prefix=PREFIX where to find shared libraries, etc. [$interp_prefix]" +echo " --interp-prefix=PREFIX where to find shared libraries, etc." +echo " use %M for cpu name [$interp_prefix]" echo " --target-list=LIST set target list [$target_list]" echo "" echo "Advanced options (experts only):" @@ -199,14 +269,38 @@ echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]" echo " --cc=CC use C compiler CC [$cc]" echo " --make=MAKE use specified make [$make]" echo " --static enable static build [$static]" +echo " --enable-mingw32 enable Win32 cross compilation with mingw32" echo "" echo "NOTE: The object files are build at the place where configure is launched" exit 1 fi +if test "$mingw32" = "yes" ; then +if test -z "$prefix" ; then + prefix="/c/Program Files/Qemu" +fi +mandir="$prefix" +datadir="$prefix" +docdir="$prefix" +bindir="$prefix" +else +if test -z "$prefix" ; then + prefix="/usr/local" +fi +mandir="$prefix/share/man" +datadir="$prefix/share/qemu" +docdir="$prefix/share/doc/qemu" +bindir="$prefix/bin" +fi + echo "Install prefix $prefix" -echo "Source path $source_path" +echo "BIOS directory $datadir" +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" echo "host CPU $cpu" @@ -215,19 +309,30 @@ echo "target list $target_list" echo "gprof enabled $gprof" echo "static build $static" echo "SDL support $sdl" +echo "SDL static link $sdl_static" +echo "mingw32 support $mingw32" + if test $sdl_too_old = "yes"; then echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support" fi +if test "$sdl_static" = "no"; then + echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output" +fi config_mak="config-host.mak" config_h="config-host.h" -echo "Creating $config_mak and $config_h" +#echo "Creating $config_mak and $config_h" echo "# Automatically generated by configure - do not modify" > $config_mak 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 "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 @@ -238,9 +343,13 @@ echo "AR=$ar" >> $config_mak echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak echo "CFLAGS=$CFLAGS" >> $config_mak echo "LDFLAGS=$LDFLAGS" >> $config_mak +echo "EXESUF=$EXESUF" >> $config_mak if test "$cpu" = "i386" ; then echo "ARCH=i386" >> $config_mak echo "#define HOST_I386 1" >> $config_h +elif test "$cpu" = "amd64" ; then + echo "ARCH=amd64" >> $config_mak + echo "#define HOST_AMD64 1" >> $config_h elif test "$cpu" = "armv4l" ; then echo "ARCH=arm" >> $config_mak echo "#define HOST_ARM 1" >> $config_h @@ -265,6 +374,9 @@ elif test "$cpu" = "sparc64" ; then elif test "$cpu" = "ia64" ; then echo "ARCH=ia64" >> $config_mak echo "#define HOST_IA64 1" >> $config_h +elif test "$cpu" = "m68k" ; then + echo "ARCH=m68k" >> $config_mak + echo "#define HOST_M68K 1" >> $config_h else echo "Unsupported CPU" exit 1 @@ -273,19 +385,27 @@ if test "$bigendian" = "yes" ; then echo "WORDS_BIGENDIAN=yes" >> $config_mak echo "#define WORDS_BIGENDIAN 1" >> $config_h fi -echo "#define HAVE_BYTESWAP_H 1" >> $config_h +if test "$mingw32" = "yes" ; then + echo "CONFIG_WIN32=yes" >> $config_mak + echo "#define CONFIG_WIN32 1" >> $config_h +elif test -f "/usr/include/byteswap.h" ; then + echo "#define HAVE_BYTESWAP_H 1" >> $config_h +fi +if test "$gdbstub" = "yes" ; then + echo "CONFIG_GDBSTUB=yes" >> $config_mak + echo "#define CONFIG_GDBSTUB 1" >> $config_h +fi if test "$gprof" = "yes" ; then echo "TARGET_GPROF=yes" >> $config_mak echo "#define HAVE_GPROF 1" >> $config_h fi if test "$static" = "yes" ; then echo "CONFIG_STATIC=yes" >> $config_mak + echo "#define CONFIG_STATIC 1" >> $config_h fi -if test "$sdl" = "yes" ; then - echo "CONFIG_SDL=yes" >> $config_mak - echo "#define CONFIG_SDL 1" >> $config_h - echo "SDL_LIBS=`sdl-config --libs`" >> $config_mak - echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_mak +if test "$slirp" = "yes" ; then + echo "CONFIG_SLIRP=yes" >> $config_mak + echo "#define CONFIG_SLIRP 1" >> $config_h fi echo -n "VERSION=" >>$config_mak head $source_path/VERSION >>$config_mak @@ -297,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" @@ -304,14 +432,27 @@ config_mak=$target_dir/config.mak config_h=$target_dir/config.h target_cpu=`echo $target | cut -d '-' -f 1` target_bigendian="no" +[ "$target_cpu" = "sparc" ] && target_bigendian=yes +[ "$target_cpu" = "ppc" ] && target_bigendian=yes target_softmmu="no" if expr $target : '.*-softmmu' > /dev/null ; then target_softmmu="yes" fi +target_user_only="no" +if expr $target : '.*-user' > /dev/null ; then + target_user_only="yes" +fi -echo "Creating $config_mak, $config_h and $target_dir/Makefile" +#echo "Creating $config_mak, $config_h and $target_dir/Makefile" 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 echo "# Automatically generated by configure - do not modify" > $config_mak @@ -320,7 +461,9 @@ echo "/* Automatically generated by configure - do not modify */" > $config_h echo "include ../config-host.mak" >> $config_mak echo "#include \"../config-host.h\"" >> $config_h -echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix\"" >> $config_h + +interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"` +echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h if test "$target_cpu" = "i386" ; then echo "TARGET_ARCH=i386" >> $config_mak @@ -330,6 +473,14 @@ elif test "$target_cpu" = "arm" ; then echo "TARGET_ARCH=arm" >> $config_mak echo "#define TARGET_ARCH \"arm\"" >> $config_h echo "#define TARGET_ARM 1" >> $config_h +elif test "$target_cpu" = "sparc" ; then + echo "TARGET_ARCH=sparc" >> $config_mak + echo "#define TARGET_ARCH \"sparc\"" >> $config_h + echo "#define TARGET_SPARC 1" >> $config_h +elif test "$target_cpu" = "ppc" ; then + echo "TARGET_ARCH=ppc" >> $config_mak + echo "#define TARGET_ARCH \"ppc\"" >> $config_h + echo "#define TARGET_PPC 1" >> $config_h else echo "Unsupported target CPU" exit 1 @@ -342,6 +493,33 @@ if test "$target_softmmu" = "yes" ; then echo "CONFIG_SOFTMMU=yes" >> $config_mak echo "#define CONFIG_SOFTMMU 1" >> $config_h fi +if test "$target_user_only" = "yes" ; then + echo "CONFIG_USER_ONLY=yes" >> $config_mak + echo "#define CONFIG_USER_ONLY 1" >> $config_h +fi + +# sdl defines + +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 + else + if test "$sdl" = "yes" ; then + echo "#define CONFIG_SDL 1" >> $config_h + echo "CONFIG_SDL=yes" >> $config_mak + echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak + fi + 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