--- qemu.ORIG/configure	2007-11-08 13:05:36.000000000 -0500
+++ qemu/configure	2007-11-09 23:14:57.708052000 -0500
@@ -346,6 +346,7 @@
 if [ "$solaris" = "yes" -a  "$cpu" = "x86_64" ] ; then
     CFLAGS="${CFLAGS} -m64"
     OS_CFLAGS="${OS_CFLAGS} -m64"
+    OS_LDFLAGS="${OS_LDFLAGS} -m64"
 fi
 
 if [ "$solaris" = "yes" -a  "$cpu" = "i386" ] ; then
@@ -580,7 +581,7 @@
 #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> /tmp/qemu-$$-sdl-config.log ; then
+        if $cc -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-$$-sdl-config.log ; then
             _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
             if test "$_sdlversion" -lt 121 ; then
                 sdl_too_old=yes
@@ -599,7 +600,7 @@
                     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
+                if $cc -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
                     sdl_static=yes
                 fi
             fi # static link