--- SheepShaver/src/Unix/configure.in	2004/06/22 22:41:44	1.25
+++ SheepShaver/src/Unix/configure.in	2004/06/24 15:37:25	1.26
@@ -15,6 +15,7 @@ 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])
@@ -86,14 +87,39 @@ fi
 dnl Checks for libraries.
 AC_CHECK_LIB(posix4, sem_init)
 
-dnl We need X11.
-AC_PATH_XTRA
-if [[ "x$no_x" = "xyes" ]]; then
-  AC_MSG_ERROR([You need X11 to run SheepShaver.])
-fi
-CFLAGS="$CFLAGS $X_CFLAGS"
-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
+dnl Do we need SDL?
+WANT_SDL=no
+SDL_SUPPORT="none"
+if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
+  WANT_SDL=yes
+  WANT_XF86_DGA=no
+  WANT_XF86_VIDMODE=no
+  WANT_FBDEV_DGA=no
+  SDL_SUPPORT="video"
+fi
+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`
+    CFLAGS="$CFLAGS $sdl_cflags"
+    CXXFLAGS="$CXXFLAGS $sdl_cflags"
+    LIBS="$LIBS $sdl_libs"
+  else
+    WANT_SDL=no
+  fi
+fi
+
+dnl We need X11, if not using SDL.
+if [[ "x$WANT_SDL" = "xno" ]]; then
+  AC_PATH_XTRA
+  if [[ "x$no_x" = "xyes" ]]; then
+    AC_MSG_ERROR([You need X11 to run SheepShaver.])
+  fi
+  CFLAGS="$CFLAGS $X_CFLAGS"
+  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+  LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
+fi
 
 dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
 HAVE_PTHREADS=yes
@@ -261,7 +287,19 @@ darwin*)
   fi
   ;;
 esac
-SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
+
+dnl SDL overrides
+if [[ "x$WANT_SDL" = "xyes" ]]; then
+  AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
+fi
+if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
+  VIDEOSRCS="../SDL/video_sdl.cpp ../dummy/clip_dummy.cpp"
+  AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
+else
+  VIDEOSRCS="video_x.cpp clip_unix.cpp"
+fi
+
+SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
 
 dnl Define a macro that translates a yesno-variable into a C macro definition
 dnl to be put into the config.h file
@@ -837,6 +875,7 @@ dnl Print summary.
 echo
 echo SheepShaver configuration summary:
 echo
+echo SDL support ...................... : $SDL_SUPPORT
 echo XFree86 DGA support .............. : $WANT_XF86_DGA
 echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
 echo Using PowerPC emulator ........... : $EMULATED_PPC