--- SheepShaver/src/Unix/configure.ac	2005/03/13 12:49:30	1.19
+++ SheepShaver/src/Unix/configure.ac	2005/03/27 19:05:18	1.21
@@ -17,11 +17,19 @@ ulimit -c 0
 dnl Options.
 AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
 AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
+AC_ARG_ENABLE(fbdev-dga,    [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb0 [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
 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_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(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
+  [case "$withval" in
+   gtk1)      WANT_GTK="gtk";;
+   gtk|gtk2)  WANT_GTK="$withval";;
+   yes)       WANT_GTK="gtk2 gtk";;
+   *)         WANT_GTK="no";;
+   esac],
+  [WANT_GTK="gtk2 gtk"])
 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])
 
@@ -115,6 +123,7 @@ dnl Do we need SDL?
 WANT_SDL=no
 if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
   WANT_SDL=yes
+  WANT_FBDEV_DGA=no
   WANT_XF86_DGA=no
   WANT_XF86_VIDMODE=no
   WANT_FBDEV_DGA=no
@@ -198,6 +207,16 @@ no:linux*|no:netbsd*)
   ;;
 esac
 
+dnl We use FBDev DGA if possible.
+if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
+  AC_CHECK_HEADER(linux/fb.h, [
+    AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
+  ], [
+    AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
+    WANT_FBDEV_DGA=no
+  ])
+fi
+
 dnl We use XFree86 DGA if possible.
 if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
   AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, [
@@ -222,7 +241,30 @@ fi
 
 dnl We use GTK+ if possible.
 UISRCS=../dummy/prefs_editor_dummy.cpp
-if [[ "x$WANT_GTK" = "xyes" ]]; then
+case "x$WANT_GTK" in
+xgtk2*)
+  AM_PATH_GTK_2_0(1.3.15, [
+    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
+    CFLAGS="$CFLAGS $GTK_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+    LIBS="$LIBS $GTK_LIBS"
+    UISRCS=prefs_editor_gtk.cpp
+    WANT_GTK=gtk2
+  ], [
+    case "x${WANT_GTK}x" in
+    *gtkx)
+      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
+      WANT_GTK=gtk
+      ;;
+    *)
+      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
+      WANT_GTK=no
+      ;;
+    esac
+  ])
+  ;;
+esac
+if [[ "x$WANT_GTK" = "xgtk" ]]; then
   AM_PATH_GTK(1.2.0, [
     AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
     CFLAGS="$CFLAGS $GTK_CFLAGS"
@@ -1137,6 +1179,7 @@ echo
 echo SheepShaver configuration summary:
 echo
 echo SDL support ...................... : $SDL_SUPPORT
+echo FBDev DGA support ................ : $WANT_FBDEV_DGA
 echo XFree86 DGA support .............. : $WANT_XF86_DGA
 echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
 echo Using PowerPC emulator ........... : $EMULATED_PPC