--- BasiliskII/src/Windows/configure.ac	2005/06/20 08:43:50	1.3
+++ BasiliskII/src/Windows/configure.ac	2006/04/20 22:36:26	1.5
@@ -11,6 +11,9 @@ dnl Aliases for PACKAGE and VERSION macr
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME", [Define this program name.])
 AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION", [Define this program version.])
 
+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])
+
 dnl JIT compiler options.
 AC_ARG_ENABLE(jit-compiler,  [  --enable-jit-compiler   enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
 AC_ARG_ENABLE(jit-debug,     [  --enable-jit-debug      activate native code disassemblers [default=no]], [WANT_JIT_DEBUG=$enableval], [WANT_JIT_DEBUG=no])
@@ -174,6 +177,26 @@ else
   AC_MSG_ERROR([Sorry, Windows exceptions don't work as expected on your system.])
 fi
 
+dnl Check if we can ignore the fault (instruction skipping in SIGSEGV handler)
+AC_CACHE_CHECK([whether we can skip instruction in SIGSEGV handler],
+  ac_cv_have_skip_instruction, [
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_RUN([
+    #define HAVE_SIGSEGV_SKIP_INSTRUCTION 1
+    #define CONFIGURE_TEST_SIGSEGV_RECOVERY
+    #include "../Unix/vm_alloc.cpp"
+    #include "../Unix/sigsegv.cpp"
+  ], ac_cv_have_skip_instruction=yes, ac_cv_have_skip_instruction=no,
+  dnl When cross-compiling, do not assume anything.
+  ac_cv_have_skip_instruction=no
+  )
+  AC_LANG_RESTORE
+  ]
+)
+AC_TRANSLATE_DEFINE(HAVE_SIGSEGV_SKIP_INSTRUCTION, "$ac_cv_have_skip_instruction",
+  [Define if we can ignore the fault (instruction skipping in SIGSEGV handler).])
+
 dnl We really want VOSF (Video on SEGV Signals) screen updates acceleration
 AC_DEFINE(ENABLE_VOSF, 1, [Define if using video enabled on SEGV signals.])
 
@@ -489,7 +512,16 @@ dnl We really want SDL for now
 AC_CHECK_TOOL(sdl_config, sdl-config, [AC_MSG_ERROR([Sorry, you currently need SDL for this port])])
 SDL_CFLAGS=`$sdl_config --cflags`
 AC_SUBST(SDL_CFLAGS)
-SDL_LIBS=`$sdl_config --libs`
+if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
+  SDL_LIBS=`$sdl_config --static-libs`
+  sdl_prefix=`$sdl_config --exec-prefix`
+  if [[ -n "$sdl_prefix" ]]; then
+    SDL_LIBS=`echo "$SDL_LIBS" | sed -e "s,-l\(SDLmain\|SDL\),$sdl_prefix/lib/lib\1.a,g"`
+  fi
+  SDL_LIBS="$SDL_LIBS -lwinmm"
+else
+  SDL_LIBS=`$sdl_config --libs`
+fi
 AC_SUBST(SDL_LIBS)
 AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
 AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])