trap "rm -f $TMPC $TMPO $TMPE ; exit" 0 2 3 15
compile_object() {
- $cc $CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null
+ $cc $QEMU_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null
}
compile_prog() {
local_cflags="$1"
local_ldflags="$2"
- $cc $CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags > /dev/null 2> /dev/null
+ $cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags > /dev/null 2> /dev/null
}
# default parameters
prefix=""
interp_prefix="/usr/gnemul/qemu-%M"
static="no"
+sparc_cpu=""
cross_prefix=""
cc="gcc"
audio_drv_list=""
install="install"
objcopy="objcopy"
ld="ld"
+helper_cflags=""
+libs_softmmu=""
+libs_tools=""
+audio_pt_int=""
# parse CC options first
for opt do
;;
--cpu=*) cpu="$optarg"
;;
- --extra-cflags=*) CFLAGS="$optarg $CFLAGS"
+ --extra-cflags=*) QEMU_CFLAGS="$optarg $QEMU_CFLAGS"
;;
--extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS"
;;
+ --sparc_cpu=*)
+ sparc_cpu="$optarg"
+ case $sparc_cpu in
+ v7|v8|v8plus|v8plusa)
+ cpu="sparc"
+ ;;
+ v9)
+ cpu="sparc64"
+ ;;
+ *)
+ echo "undefined SPARC architecture. Exiting";
+ exit 1
+ ;;
+ esac
+ ;;
esac
done
-
# OS specific
# Using uname is really, really broken. Once we have the right set of checks
# we can eliminate it's usage altogether
target_list=""
case "$cpu" in
+ alpha|cris|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|sparc64)
+ cpu="$cpu"
+ ;;
i386|i486|i586|i686|i86pc|BePC)
cpu="i386"
;;
x86_64|amd64)
cpu="x86_64"
;;
- alpha)
- cpu="alpha"
- ;;
armv*b)
cpu="armv4b"
;;
armv*l)
cpu="armv4l"
;;
- cris)
- cpu="cris"
- ;;
parisc|parisc64)
cpu="hppa"
;;
- ia64)
- cpu="ia64"
- ;;
- m68k)
- cpu="m68k"
- ;;
- microblaze)
- cpu="microblaze"
- ;;
- mips)
- cpu="mips"
- ;;
- mips64)
- cpu="mips64"
- ;;
- ppc)
- cpu="ppc"
- ;;
- ppc64)
- cpu="ppc64"
- ;;
s390*)
cpu="s390"
;;
sparc|sun4[cdmuv])
cpu="sparc"
;;
- sparc64)
- cpu="sparc64"
- ;;
*)
cpu="unknown"
;;
esac
-brlapi="yes"
+
+# Default value for a variable defining feature "foo"
+# * foo="no", feature will only be used if --enable-foo arg is given
+# * foo="", feature will be searched for, and if found, will be used
+# * foo="yes", this value vill only be set by --enable-foo flag.
+# feature will searched for, if not found, configure exits with error
+#
+# Always add --enable-foo and --disable-foo command line args. Distributions want
+# to ensure that several features are compiled in, and it is impossible without a
+# --enable-foo that exits if feature is not found
+
+bluez=""
+brlapi=""
+curl=""
+curses=""
+docs=""
+nptl=""
+vde=""
+vnc_tls=""
+vnc_sasl=""
+
gprof="no"
debug_tcg="no"
debug="no"
mingw32="no"
EXESUF=""
slirp="yes"
-vde="yes"
fmod_lib=""
fmod_inc=""
oss_lib=""
-vnc_tls="yes"
-vnc_sasl="yes"
bsd="no"
linux="no"
solaris="no"
-kqemu="no"
profiler="no"
cocoa="no"
softmmu="yes"
darwin_user="no"
bsd_user="no"
guest_base=""
-build_docs="yes"
uname_release=""
-curses="yes"
-curl="yes"
-pthread="yes"
-aio="yes"
io_thread="no"
-nptl="yes"
mixemu="no"
-bluez="yes"
kvm="no"
kerneldir=""
aix="no"
else
targetos=`uname -s`
fi
+
case $targetos in
CYGWIN*)
-mingw32="yes"
-CFLAGS="-mno-cygwin $CFLAGS"
-if [ "$cpu" = "i386" ] ; then
- kqemu="yes"
-fi
-audio_possible_drivers="sdl"
+ mingw32="yes"
+ QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS"
+ audio_possible_drivers="sdl"
;;
MINGW32*)
-mingw32="yes"
-if [ "$cpu" = "i386" ] ; then
- kqemu="yes"
-fi
-audio_possible_drivers="dsound sdl fmod"
+ mingw32="yes"
+ audio_possible_drivers="dsound sdl fmod"
;;
GNU/kFreeBSD)
-audio_drv_list="oss"
-audio_possible_drivers="oss sdl esd pa"
-if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
- kqemu="yes"
-fi
+ audio_drv_list="oss"
+ audio_possible_drivers="oss sdl esd pa"
;;
FreeBSD)
-bsd="yes"
-audio_drv_list="oss"
-audio_possible_drivers="oss sdl esd pa"
-if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
- kqemu="yes"
-fi
+ bsd="yes"
+ audio_drv_list="oss"
+ audio_possible_drivers="oss sdl esd pa"
;;
DragonFly)
-bsd="yes"
-audio_drv_list="oss"
-audio_possible_drivers="oss sdl esd pa"
-if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
- kqemu="yes"
-fi
-aio="no"
+ bsd="yes"
+ audio_drv_list="oss"
+ audio_possible_drivers="oss sdl esd pa"
;;
NetBSD)
-bsd="yes"
-audio_drv_list="oss"
-audio_possible_drivers="oss sdl esd"
-oss_lib="-lossaudio"
+ bsd="yes"
+ audio_drv_list="oss"
+ audio_possible_drivers="oss sdl esd"
+ oss_lib="-lossaudio"
;;
OpenBSD)
-bsd="yes"
-audio_drv_list="oss"
-audio_possible_drivers="oss sdl esd"
-oss_lib="-lossaudio"
+ bsd="yes"
+ audio_drv_list="oss"
+ audio_possible_drivers="oss sdl esd"
+ oss_lib="-lossaudio"
;;
Darwin)
-bsd="yes"
-darwin="yes"
-# on Leopard most of the system is 32-bit, so we have to ask the kernel it if we can run 64-bit userspace code
-if [ "$cpu" = "i386" ] ; then
+ bsd="yes"
+ darwin="yes"
+ # on Leopard most of the system is 32-bit, so we have to ask the kernel it if we can
+ # run 64-bit userspace code
+ if [ "$cpu" = "i386" ] ; then
is_x86_64=`sysctl -n hw.optional.x86_64`
[ "$is_x86_64" = "1" ] && cpu=x86_64
-fi
-if [ "$cpu" = "x86_64" ] ; then
- CFLAGS="-arch x86_64 $CFLAGS"
+ fi
+ if [ "$cpu" = "x86_64" ] ; then
+ QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS"
LDFLAGS="-arch x86_64 $LDFLAGS"
-else
- CFLAGS="-mdynamic-no-pic $CFLAGS"
-fi
-darwin_user="yes"
-cocoa="yes"
-audio_drv_list="coreaudio"
-audio_possible_drivers="coreaudio sdl fmod"
-LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS"
+ else
+ QEMU_CFLAGS="-mdynamic-no-pic $QEMU_CFLAGS"
+ fi
+ darwin_user="yes"
+ cocoa="yes"
+ audio_drv_list="coreaudio"
+ audio_possible_drivers="coreaudio sdl fmod"
+ LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS"
+ libs_softmmu="-F/System/Library/Frameworks -framework Cocoa -framework IOKit $libs_softmmu"
;;
SunOS)
- solaris="yes"
- make="gmake"
- install="ginstall"
- needs_libsunmath="no"
- solarisrev=`uname -r | cut -f2 -d.`
- # have to select again, because `uname -m` returns i86pc
- # even on an x86_64 box.
- solariscpu=`isainfo -k`
- if test "${solariscpu}" = "amd64" ; then
- cpu="x86_64"
- fi
- if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
- if test "$solarisrev" -le 9 ; then
- if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then
- needs_libsunmath="yes"
- else
- echo "QEMU will not link correctly on Solaris 8/X86 or 9/x86 without"
- echo "libsunmath from the Sun Studio compilers tools, due to a lack of"
- echo "C99 math features in libm.so in Solaris 8/x86 and Solaris 9/x86"
- echo "Studio 11 can be downloaded from www.sun.com."
- exit 1
- fi
- fi
- if test "$solarisrev" -ge 9 ; then
- kqemu="yes"
- fi
- fi
- if test -f /usr/include/sys/soundcard.h ; then
- audio_drv_list="oss"
+ solaris="yes"
+ make="gmake"
+ install="ginstall"
+ needs_libsunmath="no"
+ solarisrev=`uname -r | cut -f2 -d.`
+ # have to select again, because `uname -m` returns i86pc
+ # even on an x86_64 box.
+ solariscpu=`isainfo -k`
+ if test "${solariscpu}" = "amd64" ; then
+ cpu="x86_64"
+ fi
+ if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
+ if test "$solarisrev" -le 9 ; then
+ if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then
+ needs_libsunmath="yes"
+ QEMU_CFLAGS="-I/opt/SUNWspro/prod/include/cc $QEMU_CFLAGS"
+ LDFLAGS="-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib $LDFLAGS"
+ LIBS="-lsunmath $LIBS"
+ else
+ echo "QEMU will not link correctly on Solaris 8/X86 or 9/x86 without"
+ echo "libsunmath from the Sun Studio compilers tools, due to a lack of"
+ echo "C99 math features in libm.so in Solaris 8/x86 and Solaris 9/x86"
+ echo "Studio 11 can be downloaded from www.sun.com."
+ exit 1
+ fi
fi
- audio_possible_drivers="oss sdl"
- CFLAGS="-std=gnu99 $CFLAGS"
+ fi
+ if test -f /usr/include/sys/soundcard.h ; then
+ audio_drv_list="oss"
+ fi
+ audio_possible_drivers="oss sdl"
+ QEMU_CFLAGS="-std=gnu99 $QEMU_CFLAGS"
+ LIBS="-lsocket -lnsl -lresolv $LIBS"
;;
AIX)
-aix="yes"
-make="gmake"
+ aix="yes"
+ make="gmake"
;;
*)
-audio_drv_list="oss"
-audio_possible_drivers="oss alsa sdl esd pa"
-linux="yes"
-linux_user="yes"
-usb="linux"
-kvm="yes"
-if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
- kqemu="yes"
+ audio_drv_list="oss"
+ audio_possible_drivers="oss alsa sdl esd pa"
+ linux="yes"
+ linux_user="yes"
+ usb="linux"
+ kvm="yes"
+ if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
audio_possible_drivers="$audio_possible_drivers fmod"
-fi
+ fi
;;
esac
fi
if test "$mingw32" = "yes" ; then
- linux="no"
EXESUF=".exe"
- linux_user="no"
- bsd_user="no"
- CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $CFLAGS"
+ QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"
+ LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
fi
# find source path
;;
--disable-vnc-tls) vnc_tls="no"
;;
+ --enable-vnc-tls) vnc_tls="yes"
+ ;;
--disable-vnc-sasl) vnc_sasl="no"
;;
+ --enable-vnc-sasl) vnc_sasl="yes"
+ ;;
--disable-slirp) slirp="no"
;;
--disable-vde) vde="no"
;;
- --disable-kqemu) kqemu="no"
+ --enable-vde) vde="yes"
;;
--disable-xen) xen="no"
;;
--disable-brlapi) brlapi="no"
;;
+ --enable-brlapi) brlapi="yes"
+ ;;
--disable-bluez) bluez="no"
;;
+ --enable-bluez) bluez="yes"
+ ;;
--disable-kvm) kvm="no"
;;
--enable-profiler) profiler="yes"
;;
--enable-system) softmmu="yes"
;;
+ --disable-user)
+ linux_user="no" ;
+ bsd_user="no" ;
+ darwin_user="no"
+ ;;
+ --enable-user) ;;
--disable-linux-user) linux_user="no"
;;
--enable-linux-user) linux_user="yes"
--enable-uname-release=*) uname_release="$optarg"
;;
--sparc_cpu=*)
- sparc_cpu="$optarg"
- case $sparc_cpu in
- v7|v8)
- CFLAGS="-m32 -mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__ $CFLAGS"
- LDFLAGS="-m32 $LDFLAGS"
- cpu="sparc"
- ;;
- v8plus|v8plusa)
- CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__ $CFLAGS"
- LDFLAGS="-m32 $LDFLAGS"
- cpu="sparc"
- ;;
- v9)
- CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__ $CFLAGS"
- LDFLAGS="-m64 $LDFLAGS"
- cpu="sparc64"
- ;;
- *)
- echo "undefined SPARC architecture. Exiting";
- exit 1
- ;;
- esac
;;
--enable-werror) werror="yes"
;;
;;
--disable-curses) curses="no"
;;
+ --enable-curses) curses="yes"
+ ;;
--disable-curl) curl="no"
;;
- --disable-nptl) nptl="no"
+ --enable-curl) curl="yes"
;;
- --enable-mixemu) mixemu="yes"
+ --disable-nptl) nptl="no"
;;
- --disable-pthread) pthread="no"
+ --enable-nptl) nptl="yes"
;;
- --disable-aio) aio="no"
+ --enable-mixemu) mixemu="yes"
;;
--enable-io-thread) io_thread="yes"
;;
;;
--with-pkgversion=*) pkgversion=" ($optarg)"
;;
- --disable-docs) build_docs="no"
+ --disable-docs) docs="no"
+ ;;
+ --enable-docs) docs="yes"
;;
*) echo "ERROR: unknown option $opt"; show_help="yes"
;;
#
# If cpu ~= sparc and sparc_cpu hasn't been defined, plug in the right
-# CFLAGS/LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
+# QEMU_CFLAGS/LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
#
host_guest_base="no"
case "$cpu" in
- sparc) if test -z "$sparc_cpu" ; then
- CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__ $CFLAGS"
- LDFLAGS="-m32 $LDFLAGS"
- fi
- CFLAGS="-ffixed-g2 -ffixed-g3 $CFLAGS"
+ sparc) case $sparc_cpu in
+ v7|v8)
+ QEMU_CFLAGS="-mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__ $QEMU_CFLAGS"
+ ;;
+ v8plus|v8plusa)
+ QEMU_CFLAGS="-mcpu=ultrasparc -D__sparc_${sparc_cpu}__ $QEMU_CFLAGS"
+ ;;
+ *) # sparc_cpu not defined in the command line
+ QEMU_CFLAGS="-mcpu=ultrasparc -D__sparc_v8plus__ $QEMU_CFLAGS"
+ esac
+ LDFLAGS="-m32 $LDFLAGS"
+ QEMU_CFLAGS="-m32 -ffixed-g2 -ffixed-g3 $QEMU_CFLAGS"
if test "$solaris" = "no" ; then
- CFLAGS="-ffixed-g1 -ffixed-g6 $CFLAGS"
+ QEMU_CFLAGS="-ffixed-g1 -ffixed-g6 $QEMU_CFLAGS"
+ helper_cflags="-ffixed-i0"
fi
;;
- sparc64) if test -z "$sparc_cpu" ; then
- CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__ $CFLAGS"
- LDFLAGS="-m64 $LDFLAGS"
- fi
- if test "$solaris" = "no" ; then
- CFLAGS="-ffixed-g5 -ffixed-g6 -ffixed-g7 $CFLAGS"
- else
- CFLAGS="-ffixed-g1 -ffixed-g5 -ffixed-g6 -ffixed-g7 $CFLAGS"
+ sparc64)
+ QEMU_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__ $QEMU_CFLAGS"
+ LDFLAGS="-m64 $LDFLAGS"
+ QEMU_CFLAGS="-ffixed-g5 -ffixed-g6 -ffixed-g7 $QEMU_CFLAGS"
+ if test "$solaris" != "no" ; then
+ QEMU_CFLAGS="-ffixed-g1 $QEMU_CFLAGS"
fi
;;
s390)
- CFLAGS="-march=z900 $CFLAGS"
+ QEMU_CFLAGS="-march=z900 $QEMU_CFLAGS"
;;
i386)
- CFLAGS="-m32 $CFLAGS"
+ QEMU_CFLAGS="-m32 $QEMU_CFLAGS"
LDFLAGS="-m32 $LDFLAGS"
+ helper_cflags="-fomit-frame-pointer"
host_guest_base="yes"
;;
x86_64)
- CFLAGS="-m64 $CFLAGS"
+ QEMU_CFLAGS="-m64 $QEMU_CFLAGS"
LDFLAGS="-m64 $LDFLAGS"
host_guest_base="yes"
;;
echo " use %M for cpu name [$interp_prefix]"
echo " --target-list=LIST set target list [$target_list]"
echo ""
-echo "kqemu kernel acceleration support:"
-echo " --disable-kqemu disable kqemu support"
-echo ""
echo "Advanced options (experts only):"
echo " --source-path=PATH path of source code [$source_path]"
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 " --extra-cflags=CFLAGS append extra C compiler flags CFLAGS"
+echo " --extra-cflags=CFLAGS append extra C compiler flags QEMU_CFLAGS"
echo " --extra-ldflags=LDFLAGS append extra linker flags LDFLAGS"
echo " --make=MAKE use specified make [$make]"
echo " --install=INSTALL use specified install [$install]"
echo " --enable-mixemu enable mixer emulation"
echo " --disable-xen disable xen backend driver support"
echo " --disable-brlapi disable BrlAPI"
+echo " --enable-brlapi enable BrlAPI"
echo " --disable-vnc-tls disable TLS encryption for VNC server"
+echo " --enable-vnc-tls enable TLS encryption for VNC server"
echo " --disable-vnc-sasl disable SASL encryption for VNC server"
+echo " --enable-vnc-sasl enable SASL encryption for VNC server"
echo " --disable-curses disable curses output"
+echo " --enable-curses enable curses output"
echo " --disable-curl disable curl connectivity"
+echo " --enable-curl enable curl connectivity"
echo " --disable-bluez disable bluez stack connectivity"
+echo " --enable-bluez enable bluez stack connectivity"
echo " --disable-kvm disable KVM acceleration support"
echo " --disable-nptl disable usermode NPTL support"
+echo " --enable-nptl disable usermode NPTL support"
echo " --enable-system enable all system emulation targets"
echo " --disable-system disable all system emulation targets"
+echo " --enable-user enable supported user emulation targets"
+echo " --disable-user disable all user emulation targets"
echo " --enable-linux-user enable all linux usermode emulation targets"
echo " --disable-linux-user disable all linux usermode emulation targets"
echo " --enable-darwin-user enable all darwin usermode emulation targets"
echo " --enable-uname-release=R Return R for uname -r in usermode emulation"
echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9"
echo " --disable-vde disable support for vde network"
-echo " --disable-pthread disable pthread support"
-echo " --disable-aio disable AIO support"
+echo " --enable-vde enable support for vde network"
echo " --enable-io-thread enable IO thread"
echo " --disable-blobs disable installing provided firmware blobs"
echo " --kerneldir=PATH look for kernel includes in PATH"
exit 1
fi
+feature_not_found() {
+ feature=$1
+
+ echo "ERROR"
+ echo "ERROR: User requested feature $feature"
+ echo "ERROR: configure was not able to found it"
+ echo "ERROR"
+ exit 1;
+}
+
if test -z "$cross_prefix" ; then
# ---
else
# if cross compiling, cannot launch a program, so make a static guess
-if test "$cpu" = "armv4b" \
- -o "$cpu" = "hppa" \
- -o "$cpu" = "m68k" \
- -o "$cpu" = "mips" \
- -o "$cpu" = "mips64" \
- -o "$cpu" = "ppc" \
- -o "$cpu" = "ppc64" \
- -o "$cpu" = "s390" \
- -o "$cpu" = "sparc" \
- -o "$cpu" = "sparc64"; then
- bigendian="yes"
-fi
+case "$cpu" in
+ armv4b|hppa|m68k|mips|mips64|ppc|ppc64|s390|sparc|sparc64)
+ bigendian=yes
+ ;;
+esac
fi
# host long bits test
hostlongbits="32"
-if test "$cpu" = "x86_64" \
- -o "$cpu" = "alpha" \
- -o "$cpu" = "ia64" \
- -o "$cpu" = "sparc64" \
- -o "$cpu" = "ppc64"; then
- hostlongbits="64"
-fi
+case "$cpu" in
+ x86_64|alpha|ia64|sparc64|ppc64)
+ hostlongbits=64
+ ;;
+esac
-# Check host NPTL support
-cat > $TMPC <<EOF
+
+##########################################
+# NPTL probe
+
+if test "$nptl" != "no" ; then
+ cat > $TMPC <<EOF
#include <sched.h>
#include <linux/futex.h>
void foo()
}
EOF
-if compile_object ; then
- :
-else
- nptl="no"
+ if compile_object ; then
+ nptl=yes
+ else
+ if test "$nptl" = "yes" ; then
+ feature_not_found "nptl"
+ fi
+ nptl=no
+ fi
fi
##########################################
int main(void) { xs_daemon_open(); xc_interface_open(); return 0; }
EOF
if compile_prog "" "$xen_libs" ; then
- :
+ libs_softmmu="$xen_libs $libs_softmmu"
else
xen="no"
fi
if compile_prog "$sdl_cflags" "$sdl_libs" ; then
sdl_libs="$sdl_libs -lX11"
fi
+ if test "$mingw32" = "yes" ; then
+ sdl_libs="`echo $sdl_libs | sed s/-mwindows//g` -mconsole"
+ fi
+ libs_softmmu="$sdl_libs $libs_softmmu"
fi
##########################################
# VNC TLS detection
-if test "$vnc_tls" = "yes" ; then
-cat > $TMPC <<EOF
+if test "$vnc_tls" != "no" ; then
+ cat > $TMPC <<EOF
#include <gnutls/gnutls.h>
int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; }
EOF
- vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null`
- vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`
- if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
- :
- else
- vnc_tls="no"
+ vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null`
+ vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`
+ if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
+ vnc_tls=yes
+ libs_softmmu="$vnc_tls_libs $libs_softmmu"
+ else
+ if test "$vnc_tls" = "yes" ; then
+ feature_not_found "vnc-tls"
fi
+ vnc_tls=no
+ fi
fi
##########################################
# VNC SASL detection
if test "$vnc_sasl" = "yes" ; then
-cat > $TMPC <<EOF
+ cat > $TMPC <<EOF
#include <sasl/sasl.h>
#include <stdio.h>
int main(void) { sasl_server_init(NULL, "qemu"); return 0; }
EOF
- # Assuming Cyrus-SASL installed in /usr prefix
- vnc_sasl_cflags=""
- vnc_sasl_libs="-lsasl2"
- if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
- :
- else
- vnc_sasl="no"
+ # Assuming Cyrus-SASL installed in /usr prefix
+ vnc_sasl_cflags=""
+ vnc_sasl_libs="-lsasl2"
+ if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
+ vnc_sasl=yes
+ libs_softmmu="$vnc_sasl_libs $libs_softmmu"
+ else
+ if test "$vnc_sasl" = "yes" ; then
+ feature_not_found "vnc-sasl"
fi
+ vnc_sasl=no
+ fi
fi
##########################################
##########################################
# vde libraries probe
-if test "$vde" = "yes" ; then
- vde=no
+if test "$vde" != "no" ; then
vde_libs="-lvdeplug"
cat > $TMPC << EOF
#include <libvdeplug.h>
EOF
if compile_prog "" "$vde_libs" ; then
vde=yes
+ libs_softmmu="$vde_libs $libs_softmmu"
+ libs_tools="$vde_libs $libs_tools"
+ else
+ if test "$vde" = "yes" ; then
+ feature_not_found "vde"
+ fi
+ vde=no
fi
fi
alsa)
audio_drv_probe $drv alsa/asoundlib.h -lasound \
"snd_pcm_t **handle; return snd_pcm_close(*handle);"
+ libs_softmmu="-lasound $libs_softmmu"
;;
fmod)
exit 1
fi
audio_drv_probe $drv fmod.h $fmod_lib "return FSOUND_GetVersion();" "-I $fmod_inc"
+ libs_softmmu="$fmod_lib $libs_softmmu"
;;
esd)
audio_drv_probe $drv esd.h -lesd 'return esd_play_stream(0, 0, "", 0);'
+ libs_softmmu="-lesd $libs_softmmu"
+ audio_pt_int="yes"
;;
pa)
audio_drv_probe $drv pulse/simple.h -lpulse-simple \
"pa_simple *s = NULL; pa_simple_free(s); return 0;"
+ libs_softmmu="-lpulse-simple $libs_softmmu"
+ audio_pt_int="yes"
+ ;;
+
+ coreaudio)
+ libs_softmmu="-framework CoreAudio $libs_softmmu"
+ ;;
+
+ dsound)
+ libs_softmmu="-lole32 -ldxguid $libs_softmmu"
+ ;;
+
+ oss)
+ libs_softmmu="$oss_lib $libs_softmmu"
;;
- oss|sdl|core|wav|dsound)
+ sdl|wav)
# XXX: Probes for CoreAudio, DirectSound, SDL(?)
;;
##########################################
# BrlAPI probe
-if test "$brlapi" = "yes" ; then
- brlapi=no
+if test "$brlapi" != "no" ; then
brlapi_libs="-lbrlapi"
cat > $TMPC << EOF
#include <brlapi.h>
EOF
if compile_prog "" "$brlapi_libs" ; then
brlapi=yes
+ libs_softmmu="$brlapi_libs $libs_softmmu"
+ else
+ if test "$brlapi" = "yes" ; then
+ feature_not_found "brlapi"
+ fi
+ brlapi=no
fi
fi
##########################################
# curses probe
+curses_list="-lncurses -lcurses"
-if test "$curses" = "yes" ; then
+if test "$curses" != "no" ; then
+ curses_found=no
cat > $TMPC << EOF
#include <curses.h>
#ifdef __OpenBSD__
#endif
int main(void) { resize_term(0, 0); return curses_version(); }
EOF
- if compile_prog "" "-lncurses" ; then
- curses_libs="-lncurses"
- elif compile_prog "" "-lcurses" ; then
- curses_libs="-lcurses"
+ for curses_lib in $curses_list; do
+ if compile_prog "" "$curses_lib" ; then
+ curses_found=yes
+ libs_softmmu="$curses_lib $libs_softmmu"
+ break
+ fi
+ done
+ if test "$curses_found" = "yes" ; then
+ curses=yes
else
+ if test "$curses" = "yes" ; then
+ feature_not_found "curses"
+ fi
curses=no
fi
-fi # test "$curses"
+fi
##########################################
# curl probe
-if test "$curl" = "yes" ; then
- curl=no
+if test "$curl" != "no" ; then
cat > $TMPC << EOF
#include <curl/curl.h>
int main(void) { return curl_easy_init(); }
curl_libs=`curl-config --libs 2>/dev/null`
if compile_prog "$curl_cflags" "$curl_libs" ; then
curl=yes
+ libs_tools="$curl_libs $libs_tools"
+ libs_softmmu="$curl_libs $libs_softmmu"
+ else
+ if test "$curl" = "yes" ; then
+ feature_not_found "curl"
+ fi
+ curl=no
fi
fi # test "$curl"
##########################################
# bluez support probe
-if test "$bluez" = "yes" ; then
- `pkg-config bluez 2> /dev/null` || bluez="no"
-fi
-if test "$bluez" = "yes" ; then
+if test "$bluez" != "no" ; then
cat > $TMPC << EOF
#include <bluetooth/bluetooth.h>
int main(void) { return bt_error(0); }
bluez_cflags=`pkg-config --cflags bluez 2> /dev/null`
bluez_libs=`pkg-config --libs bluez 2> /dev/null`
if compile_prog "$bluez_cflags" "$bluez_libs" ; then
- :
+ bluez=yes
+ libs_softmmu="$bluez_libs $libs_softmmu"
else
+ if test "$bluez" = "yes" ; then
+ feature_not_found "bluez"
+ fi
bluez="no"
fi
fi
kvm="no";
if [ -x "`which awk 2>/dev/null`" ] && \
[ -x "`which grep 2>/dev/null`" ]; then
- kvmerr=`LANG=C $cc $CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \
+ kvmerr=`LANG=C $cc $QEMU_CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \
| grep "error: " \
| awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`
if test "$kvmerr" != "" ; then
##########################################
# pthread probe
PTHREADLIBS_LIST="-lpthread -lpthreadGC2"
-PTHREADLIBS=""
-if test "$pthread" = yes; then
- pthread=no
+pthread=no
cat > $TMPC << EOF
#include <pthread.h>
int main(void) { pthread_create(0,0,0,0); return 0; }
EOF
- for pthread_lib in $PTHREADLIBS_LIST; do
- if compile_prog "" "$pthread_lib" ; then
- pthread=yes
- PTHREADLIBS="$pthread_lib"
- break
- fi
- done
-fi
+for pthread_lib in $PTHREADLIBS_LIST; do
+ if compile_prog "" "$pthread_lib" ; then
+ pthread=yes
+ LIBS="$pthread_lib $LIBS"
+ break
+ fi
+done
if test "$pthread" = no; then
- aio=no
- io_thread=no
+ echo
+ echo "Error: pthread check failed"
+ echo "Make sure to have the pthread libs and headers installed."
+ echo
+ exit 1
fi
##########################################
EOF
if compile_prog "" "$fdt_libs" ; then
fdt=yes
+ libs_softmmu="$fdt_libs $libs_softmmu"
fi
fi
fi
# Check if tools are available to build documentation.
-if test "$build_docs" = "yes" -a \( ! -x "`which texi2html 2>/dev/null`" -o ! -x "`which pod2man 2>/dev/null`" \) ; then
- build_docs="no"
+if test "$docs" != "no" ; then
+ if test -x "`which texi2html 2>/dev/null`" -a \
+ -x "`which pod2man 2>/dev/null`" ; then
+ docs=yes
+ else
+ if test "$docs" = "yes" ; then
+ feature_not_found "docs"
+ fi
+ docs=no
+ fi
fi
# Search for bsawp_32 function
EOF
if compile_prog "" "" ; then
- CLOCKLIBS=""
+ :
elif compile_prog "" "-lrt" ; then
- CLOCKLIBS="-lrt"
+ LIBS="-lrt $LIBS"
fi
# Determine what linker flags to use to force archive inclusion
exit 1
fi
+if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaries" != yes -a \
+ "$aix" != "yes" ; then
+ libs_softmmu="-lutil $libs_softmmu"
+fi
+
# End of CC checks
# After here, no more $cc or $ld runs
# default flags for all hosts
-CFLAGS="-g -fno-strict-aliasing $CFLAGS"
+QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
+CFLAGS="-g $CFLAGS"
if test "$debug" = "no" ; then
CFLAGS="-O2 $CFLAGS"
fi
-CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls $CFLAGS"
+QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
+QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
+QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
+QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS"
+QEMU_CFLAGS="-I. -I\$(SRC_PATH) -MMD -MP -MT \$@ $QEMU_CFLAGS"
LDFLAGS="-g $LDFLAGS"
# Consult white-list to determine whether to enable werror
fi
if test "$werror" = "yes" ; then
- CFLAGS="-Werror $CFLAGS"
+ QEMU_CFLAGS="-Werror $QEMU_CFLAGS"
fi
if test "$solaris" = "no" ; then
echo "C compiler $cc"
echo "Host C compiler $host_cc"
echo "CFLAGS $CFLAGS"
+echo "QEMU_CFLAGS $QEMU_CFLAGS"
echo "LDFLAGS $LDFLAGS"
echo "make $make"
echo "install $install"
echo "Extra audio cards $audio_card_list"
echo "Mixer emulation $mixemu"
echo "VNC TLS support $vnc_tls"
-if test "$vnc_tls" = "yes" ; then
- echo " TLS CFLAGS $vnc_tls_cflags"
- echo " TLS LIBS $vnc_tls_libs"
-fi
echo "VNC SASL support $vnc_sasl"
-if test "$vnc_sasl" = "yes" ; then
- echo " SASL CFLAGS $vnc_sasl_cflags"
- echo " SASL LIBS $vnc_sasl_libs"
-fi
if test -n "$sparc_cpu"; then
echo "Target Sparc Arch $sparc_cpu"
fi
-echo "kqemu support $kqemu"
echo "xen support $xen"
echo "brlapi support $brlapi"
-echo "Documentation $build_docs"
+echo "bluez support $bluez"
+echo "Documentation $docs"
[ ! -z "$uname_release" ] && \
echo "uname -r $uname_release"
echo "NPTL support $nptl"
echo "GUEST_BASE $guest_base"
echo "vde support $vde"
-echo "AIO support $aio"
echo "IO thread $io_thread"
echo "Install blobs $blobs"
echo -e "KVM support $kvm"
echo "CONFIG_NEEDS_LIBSUNMATH=y" >> $config_host_mak
fi
fi
-if test "$gprof" = "yes" ; then
- echo "TARGET_GPROF=yes" >> $config_host_mak
-fi
if test "$static" = "yes" ; then
echo "CONFIG_STATIC=y" >> $config_host_mak
LDFLAGS="-static $LDFLAGS"
fi
if test "$slirp" = "yes" ; then
echo "CONFIG_SLIRP=y" >> $config_host_mak
+ CFLAGS="-I\$(SRC_PATH)/slirp $CFLAGS"
fi
if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
- echo "VDE_LIBS=$vde_libs" >> $config_host_mak
fi
for card in $audio_card_list; do
def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`
def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
echo "$def=y" >> $config_host_mak
if test "$drv" = "fmod"; then
- echo "FMOD_LIBS=$fmod_lib" >> $config_host_mak
echo "FMOD_CFLAGS=-I$fmod_inc" >> $config_host_mak
- elif test "$drv" = "oss"; then
- echo "OSS_LIBS=$oss_lib" >> $config_host_mak
fi
done
+if test "$audio_pt_int" = "yes" ; then
+ echo "CONFIG_AUDIO_PT_INT=y" >> $config_host_mak
+fi
if test "$mixemu" = "yes" ; then
echo "CONFIG_MIXEMU=y" >> $config_host_mak
fi
if test "$vnc_tls" = "yes" ; then
echo "CONFIG_VNC_TLS=y" >> $config_host_mak
echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
- echo "VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak
fi
if test "$vnc_sasl" = "yes" ; then
echo "CONFIG_VNC_SASL=y" >> $config_host_mak
echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
- echo "VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
fi
if test "$fnmatch" = "yes" ; then
echo "CONFIG_FNMATCH=y" >> $config_host_mak
echo "VPATH=$source_path" >> $config_host_mak
fi
echo "TARGET_DIRS=$target_list" >> $config_host_mak
-if [ "$build_docs" = "yes" ] ; then
+if [ "$docs" = "yes" ] ; then
echo "BUILD_DOCS=yes" >> $config_host_mak
fi
if test "$sdl" = "yes" ; then
echo "CONFIG_SDL=y" >> $config_host_mak
- echo "SDL_LIBS=$sdl_libs" >> $config_host_mak
echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
fi
if test "$cocoa" = "yes" ; then
fi
if test "$curses" = "yes" ; then
echo "CONFIG_CURSES=y" >> $config_host_mak
- echo "CURSES_LIBS=$curses_libs" >> $config_host_mak
fi
if test "$atfile" = "yes" ; then
echo "CONFIG_ATFILE=y" >> $config_host_mak
if test "$curl" = "yes" ; then
echo "CONFIG_CURL=y" >> $config_host_mak
echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak
- echo "CURL_LIBS=$curl_libs" >> $config_host_mak
fi
if test "$brlapi" = "yes" ; then
echo "CONFIG_BRLAPI=y" >> $config_host_mak
- echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak
fi
if test "$bluez" = "yes" ; then
echo "CONFIG_BLUEZ=y" >> $config_host_mak
echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
- echo "BLUEZ_LIBS=$bluez_libs" >> $config_host_mak
fi
if test "$xen" = "yes" ; then
echo "CONFIG_XEN=y" >> $config_host_mak
- echo "XEN_LIBS=$xen_libs" >> $config_host_mak
-fi
-if test "$aio" = "yes" ; then
- echo "CONFIG_AIO=y" >> $config_host_mak
fi
if test "$io_thread" = "yes" ; then
echo "CONFIG_IOTHREAD=y" >> $config_host_mak
fi
if test "$fdt" = "yes" ; then
echo "CONFIG_FDT=y" >> $config_host_mak
- echo "FDT_LIBS=$fdt_libs" >> $config_host_mak
fi
# XXX: suppress that
if test "$sparse" = "yes" ; then
echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak
echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak
- echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
+ echo "QEMU_CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
fi
echo "AR=$ar" >> $config_host_mak
echo "OBJCOPY=$objcopy" >> $config_host_mak
echo "LD=$ld" >> $config_host_mak
echo "CFLAGS=$CFLAGS" >> $config_host_mak
+echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
+echo "HELPER_CFLAGS=$helper_cflags" >> $config_host_mak
echo "LDFLAGS=$LDFLAGS" >> $config_host_mak
echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
+echo "LIBS+=$LIBS" >> $config_host_mak
+echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
-echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
-echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak
echo "/* Automatically generated by configure - do not modify */" > $config_host_h
-$SHELL $source_path/create_config < $config_host_mak >> $config_host_h
+/bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
if test -f ${config_host_h}~ ; then
if cmp -s $config_host_h ${config_host_h}~ ; then
;;
esac
echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak
+target_arch_name="`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'`"
+echo "TARGET_$target_arch_name=y" >> $config_mak
echo "TARGET_ARCH2=$target_arch2" >> $config_mak
# TARGET_BASE_ARCH needs to be defined after TARGET_ARCH
if [ "$TARGET_BASE_ARCH" = "" ]; then
if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
echo "CONFIG_XEN=y" >> $config_mak
fi
- if test $kqemu = "yes" -a "$target_softmmu" = "yes"
- then
- echo "CONFIG_KQEMU=y" >> $config_mak
- fi
esac
case "$target_arch2" in
i386|x86_64|ppcemb|ppc|ppc64)
fi
if test "$target_softmmu" = "yes" ; then
echo "CONFIG_SOFTMMU=y" >> $config_mak
+ echo "LIBS+=$libs_softmmu" >> $config_mak
fi
if test "$target_user_only" = "yes" ; then
echo "CONFIG_USER_ONLY=y" >> $config_mak
arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|sparc|sparc64|sparc32plus)
echo "CONFIG_SOFTFLOAT=y" >> $config_mak
;;
+ *)
+ echo "CONFIG_NOSOFTFLOAT=y" >> $config_mak
+ ;;
esac
if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
echo "CONFIG_BSD_USER=y" >> $config_mak
fi
-# generate LDFLAGS for targets
+# generate QEMU_CFLAGS/LDFLAGS for targets
+cflags=""
ldflags=""
-if test "$target_linux_user" = "yes" -o "$target_linux_user" = "yes" ; then
+
+if test "$ARCH" = "sparc64" ; then
+ cflags="-I\$(SRC_PATH)/tcg/sparc $cflags"
+else
+ cflags="-I\$(SRC_PATH)/tcg/\$(ARCH) $cflags"
+fi
+cflags="-I\$(SRC_PATH)/tcg $cflags"
+cflags="-I\$(SRC_PATH)/fpu $cflags"
+
+for i in $ARCH $TARGET_BASE_ARCH ; do
+ case "$i" in
+ alpha)
+ echo "CONFIG_ALPHA_DIS=y" >> $config_mak
+ ;;
+ arm)
+ echo "CONFIG_ARM_DIS=y" >> $config_mak
+ ;;
+ cris)
+ echo "CONFIG_CRIS_DIS=y" >> $config_mak
+ ;;
+ hppa)
+ echo "CONFIG_HPPA_DIS=y" >> $config_mak
+ ;;
+ i386|x86_64)
+ echo "CONFIG_I386_DIS=y" >> $config_mak
+ ;;
+ m68k)
+ echo "CONFIG_M68K_DIS=y" >> $config_mak
+ ;;
+ microblaze)
+ echo "CONFIG_MICROBLAZE_DIS=y" >> $config_mak
+ ;;
+ mips*)
+ echo "CONFIG_MIPS_DIS=y" >> $config_mak
+ ;;
+ ppc*)
+ echo "CONFIG_PPC_DIS=y" >> $config_mak
+ ;;
+ s390)
+ echo "CONFIG_S390_DIS=y" >> $config_mak
+ ;;
+ sh4)
+ echo "CONFIG_SH4_DIS=y" >> $config_mak
+ ;;
+ sparc*)
+ echo "CONFIG_SPARC_DIS=y" >> $config_mak
+ ;;
+ esac
+done
+
+case "$ARCH" in
+alpha)
+ # Ensure there's only a single GP
+ cflags="-msmall-data $cflags"
+;;
+ia64)
+ cflags="-mno-sdata $cflags"
+;;
+esac
+
+if test "$target_softmmu" = "yes" ; then
+ case "$TARGET_BASE_ARCH" in
+ arm)
+ cflags="-DHAS_AUDIO $cflags"
+ ;;
+ i386|mips|ppc)
+ cflags="-DHAS_AUDIO -DHAS_AUDIO_CHOICE $cflags"
+ ;;
+ esac
+fi
+
+if test "$target_softmmu" = "yes" -a \( \
+ "$TARGET_ARCH" = "microblaze" -o \
+ "$TARGET_ARCH" = "cris" \) ; then
+ echo "CONFIG_NEED_MMU=y" >> $config_mak
+fi
+
+if test "$gprof" = "yes" ; then
+ echo "TARGET_GPROF=yes" >> $config_mak
+ if test "$target_linux_user" = "yes" ; then
+ cflags="-p $cflags"
+ ldflags="-p $ldflags"
+ fi
+ if test "$target_softmmu" = "yes" ; then
+ ldflags="-p $ldflags"
+ echo "GPROF_CFLAGS=-p" >> $config_mak
+ fi
+fi
+
+linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld"
+if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then
case "$ARCH" in
i386)
if test "$gprof" = "yes" -o "$static" = "yes" ; then
- ldflags='-Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld'
+ ldflags="$linker_script $ldflags"
else
# WARNING: this LDFLAGS is _very_ tricky : qemu is an ELF shared object
# that the kernel ELF loader considers as an executable. I think this
# is the simplest way to make it self virtualizable!
- ldflags='-Wl,-shared'
+ ldflags="-Wl,-shared $ldflags"
fi
;;
sparc)
# -static is used to avoid g1/g3 usage by the dynamic linker
- ldflags='-Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld -static'
+ ldflags="$linker_script -static $ldflags"
;;
ia64)
- ldflags='-Wl,-G0 -Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld -static'
+ ldflags="-Wl,-G0 $linker_script -static $ldflags"
;;
x86_64|ppc|ppc64|s390|sparc64|alpha|arm|m68k|mips|mips64)
- ldflags='-Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld'
+ ldflags="$linker_script $ldflags"
;;
esac
fi
if test "$target_softmmu" = "yes" ; then
case "$ARCH" in
ia64)
- ldflags='-Wl,-G0 -Wl,-T../config-host.ld -Wl,-T,$(SRC_PATH)/$(ARCH).ld -static'
+ ldflags="-Wl,-G0 $linker_script -static $ldflags"
;;
esac
fi
-if test "$ldflags" != "" ; then
- echo "LDFLAGS+=$ldflags" >> $config_mak
-fi
+echo "LDFLAGS+=$ldflags" >> $config_mak
+echo "QEMU_CFLAGS+=$cflags" >> $config_mak
echo "/* Automatically generated by configure - do not modify */" > $config_h
echo "#include \"../config-host.h\"" >> $config_h
-$SHELL $source_path/create_config < $config_mak >> $config_h
+/bin/sh $source_path/create_config < $config_mak >> $config_h
if test -f ${config_h}~ ; then
if cmp -s $config_h ${config_h}~ ; then
rm -f $d/Makefile
ln -s $source_path/Makefile.hw $d/Makefile
echo "HWLIB=libqemuhw$hwlib.a" > $d/config.mak
- echo "CPPFLAGS=-DTARGET_PHYS_ADDR_BITS=$hwlib" >> $d/config.mak
+ echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" >> $d/config.mak
done