--- SheepShaver/src/Unix/configure.in	2004/06/24 16:13:53	1.27
+++ SheepShaver/src/Unix/configure.in	2004/06/26 15:26:17	1.29
@@ -15,12 +15,15 @@ AC_ARG_ENABLE(ppc-emulator, [  --enable-
 AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
 AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
 AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
-AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
 AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
 AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
 AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
 AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
 
+dnl SDL options.
+AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
+AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
@@ -101,7 +104,11 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
   AC_PATH_PROG(sdl_config, "sdl-config")
   if [[ -n "$sdl_config" ]]; then
     sdl_cflags=`$sdl_config --cflags`
-    sdl_libs=`$sdl_config --libs`
+    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
+      sdl_libs=`$sdl_config --static-libs`
+    else
+      sdl_libs=`$sdl_config --libs`
+    fi
     CFLAGS="$CFLAGS $sdl_cflags"
     CXXFLAGS="$CXXFLAGS $sdl_cflags"
     LIBS="$LIBS $sdl_libs"
@@ -680,14 +687,6 @@ dnl Can we do Video on SEGV Signals ?
 CAN_VOSF=no
 if [[ -n "$sigsegv_recovery" ]]; then
   CAN_VOSF=yes
-  case $target_os in
-  darwin*)
-    dnl Signal handlers in darwin are way too slow since the whole
-    dnl machine state (GPRs, FPRs, VRs) is forcibly saved.
-    dnl In other words, VOSF is slower than static window refreshes.
-    CAN_VOSF=no
-    ;;
-  esac
 fi
 
 dnl Enable VOSF screen updates with this feature is requested and feasible