projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
static link
[qemu]
/
configure
diff --git
a/configure
b/configure
index
51f8bcc
..
0e22270
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-18,7
+18,7
@@
TMPS="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.S"
# default parameters
prefix="/usr/local"
# default parameters
prefix="/usr/local"
-interp_prefix="/usr/gnemul/qemu-i386"
+interp_prefix="/usr/gnemul/qemu-%M"
static="no"
cross_prefix=""
cc="gcc"
static="no"
cross_prefix=""
cc="gcc"
@@
-27,7
+27,7
@@
ar="ar"
make="make"
strip="strip"
cpu=`uname -m`
make="make"
strip="strip"
cpu=`uname -m`
-target_list="i386 i386-softmmu arm"
+target_list="i386-user i386 i386-softmmu arm-user sparc-user"
case "$cpu" in
i386|i486|i586|i686|i86pc|BePC)
cpu="i386"
case "$cpu" in
i386|i486|i586|i686|i86pc|BePC)
cpu="i386"
@@
-193,7
+193,8
@@
EOF
echo "Standard options:"
echo " --help print this message"
echo " --prefix=PREFIX install in PREFIX [$prefix]"
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):"
echo " --target-list=LIST set target list [$target_list]"
echo ""
echo "Advanced options (experts only):"
@@
-207,9
+208,14
@@
echo "NOTE: The object files are build at the place where configure is launched"
exit 1
fi
exit 1
fi
+mandir="$prefix/share/man"
+sharedir="$prefix/share/qemu"
+
echo "Install prefix $prefix"
echo "Install prefix $prefix"
-echo "Source path $source_path"
+echo "Manual directory $mandir"
+echo "BIOS directory $sharedir"
echo "ELF interp prefix $interp_prefix"
echo "ELF interp prefix $interp_prefix"
+echo "Source path $source_path"
echo "C compiler $cc"
echo "make $make"
echo "host CPU $cpu"
echo "C compiler $cc"
echo "make $make"
echo "host CPU $cpu"
@@
-231,6
+237,9
@@
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 "/* Automatically generated by configure - do not modify */" > $config_h
echo "prefix=$prefix" >> $config_mak
+echo "mandir=$mandir" >> $config_mak
+echo "sharedir=$sharedir" >> $config_mak
+echo "#define CONFIG_QEMU_SHAREDIR \"$sharedir\"" >> $config_h
echo "MAKE=$make" >> $config_mak
echo "CC=$cc" >> $config_mak
if test "$have_gcc3_options" = "yes" ; then
echo "MAKE=$make" >> $config_mak
echo "CC=$cc" >> $config_mak
if test "$have_gcc3_options" = "yes" ; then
@@
-310,10
+319,15
@@
config_mak=$target_dir/config.mak
config_h=$target_dir/config.h
target_cpu=`echo $target | cut -d '-' -f 1`
target_bigendian="no"
config_h=$target_dir/config.h
target_cpu=`echo $target | cut -d '-' -f 1`
target_bigendian="no"
+[ "$target_cpu" = "sparc" ] && target_bigendian=yes
target_softmmu="no"
if expr $target : '.*-softmmu' > /dev/null ; then
target_softmmu="yes"
fi
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"
@@
-326,7
+340,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 "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
if test "$target_cpu" = "i386" ; then
echo "TARGET_ARCH=i386" >> $config_mak
@@
-336,6
+352,10
@@
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
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
else
echo "Unsupported target CPU"
exit 1
else
echo "Unsupported target CPU"
exit 1
@@
-348,6
+368,10
@@
if test "$target_softmmu" = "yes" ; then
echo "CONFIG_SOFTMMU=yes" >> $config_mak
echo "#define CONFIG_SOFTMMU 1" >> $config_h
fi
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
done # for target in $targets
done # for target in $targets