--- SheepShaver/src/Unix/configure.in	2004/05/09 17:44:17	1.24
+++ SheepShaver/src/Unix/configure.in	2004/06/27 22:12:52	1.30
@@ -20,6 +20,10 @@ AC_ARG_WITH(gtk,            [  --with-gt
 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
@@ -86,14 +90,43 @@ 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`
+    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"
+  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
@@ -219,7 +252,7 @@ if [[ "x$ac_cv_signal_sa_restorer" = "xy
 fi
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(strdup cfmakeraw)
+AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
 AC_CHECK_FUNCS(nanosleep)
 AC_CHECK_FUNCS(sigaction signal)
 AC_CHECK_FUNCS(mmap mprotect munmap)
@@ -240,6 +273,28 @@ no:linux*)
   ;;
 esac
 
+dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
+AC_DEFUN(AC_CHECK_FRAMEWORK, [
+  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
+  AC_CACHE_CHECK([whether compiler supports framework $1],
+    ac_Framework, [
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS -framework $1"
+    AC_TRY_LINK(
+      [$2], [int main(void) { return 0; }],
+      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
+    )
+  ])
+  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
+    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
+  )
+  AS_VAR_POPDEF([ac_Framework])dnl
+])
+
+dnl Check for some MacOS X frameworks
+AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
+AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
+
 dnl Select system-dependant sources.
 SERIALSRC=serial_unix.cpp
 ETHERSRC=../dummy/ether_dummy.cpp
@@ -259,9 +314,32 @@ darwin*)
   if [[ "x$EMULATED_PPC" = "xno" ]]; then
     EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
   fi
+  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
+    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
+  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"
+  AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
+  KEYCODES="../SDL/keycodes"
+  if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
+    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
+  else
+    EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
+  fi
+else
+  VIDEOSRCS="video_x.cpp"
+  KEYCODES="keycodes"
+  EXTRASYSSRCS="$EXTRASYSSRCS 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
@@ -652,7 +730,7 @@ else
 fi
 
 dnl Platform specific binary postprocessor
-BLESS=/bin/true
+AC_PATH_PROG(BLESS, "true")
 if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
   BLESS=Darwin/lowmem
   LDFLAGS="$LDFLAGS -pagezero_size 0x3000"
@@ -823,12 +901,14 @@ AC_SUBST(DYNGEN_OP_FLAGS)
 AC_SUBST(SYSSRCS)
 AC_SUBST(CPUSRCS)
 AC_SUBST(BLESS)
+AC_SUBST(KEYCODES)
 AC_OUTPUT(Makefile)
 
 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