$NetBSD: patch-ag,v 1.10 2008/01/04 21:37:07 sborrill Exp $ --- configure.orig 2007-02-05 23:01:54 +0000 +++ configure @@ -29,7 +29,7 @@ ar="ar" make="make" install="install" strip="strip" -cpu=`uname -m` +cpu=`uname -p` target_list="" case "$cpu" in i386|i486|i586|i686|i86pc|BePC) @@ -44,7 +44,7 @@ case "$cpu" in alpha) cpu="alpha" ;; - "Power Macintosh"|ppc|ppc64) + "Power Macintosh"|ppc|ppc64|powerpc) cpu="powerpc" ;; mips) @@ -116,6 +116,12 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64 kqemu="yes" fi ;; +DragonFly) +bsd="yes" +oss="yes" +dragonfly="yes" +;; + NetBSD) bsd="yes" oss="yes" @@ -371,6 +377,16 @@ EOF fi fi +# Check for stack protector +cat > $TMPC < /dev/null ; then + stack_protector_present="yes" +else + stack_protector_present="no" +fi + # # Solaris specific configure tool chain decisions # @@ -573,7 +589,7 @@ else if test -z "$prefix" ; then prefix="/usr/local" fi -mandir="$prefix/share/man" +mandir="$prefix/$PKGMANDIR" datadir="$prefix/share/qemu" docdir="$prefix/share/doc/qemu" bindir="$prefix/bin" @@ -711,6 +727,11 @@ if test "$mingw32" = "yes" ; then echo "#define CONFIG_WIN32 1" >> $config_h elif test -f "/usr/include/byteswap.h" ; then echo "#define HAVE_BYTESWAP_H 1" >> $config_h +elif test -f "/usr/include/machine/bswap.h" ; then + echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h +fi +if test "$dragonfly" = "yes" ; then + echo "CONFIG_DRAGONFLY=yes" >> $config_mak fi if test "$darwin" = "yes" ; then echo "CONFIG_DARWIN=yes" >> $config_mak @@ -785,6 +806,10 @@ if [ "$bsd" = "yes" ] ; then echo "#define _BSD 1" >> $config_h fi +if [ "$stack_protector_present" = "yes" ] ; then + echo "STACK_PROTECTOR_PRESENT=yes" >> $config_mak +fi + echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h for target in $target_list; do