--- SheepShaver/src/Unix/configure.ac	2006/01/15 11:41:23	1.45
+++ SheepShaver/src/Unix/configure.ac	2006/05/02 05:50:38	1.51
@@ -28,6 +28,7 @@ AC_ARG_ENABLE(fbdev-dga,    [  --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=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
 AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
+AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=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]],
   [case "$withval" in
@@ -245,11 +246,8 @@ UISRCS=../dummy/prefs_editor_dummy.cpp
 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
+    GUI_CFLAGS="$GTK_CFLAGS"
+    GUI_LIBS="$GTK_LIBS"
     WANT_GTK=gtk2
   ], [
     case "x${WANT_GTK}x" in
@@ -267,16 +265,28 @@ xgtk2*)
 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"
-    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
-    LIBS="$LIBS $GTK_LIBS"
-    UISRCS=prefs_editor_gtk.cpp
+    GUI_CFLAGS="$GTK_CFLAGS"
+    GUI_LIBS="$GTK_LIBS"
   ], [
     AC_MSG_WARN([Could not find GTK+, disabling user interface.])
     WANT_GTK=no
   ])
 fi
+if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
+  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
+  UISRCS=prefs_editor_gtk.cpp
+fi
+AC_SUBST(GUI_CFLAGS)
+AC_SUBST(GUI_LIBS)
+
+dnl Build external GUI if requested.
+if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
+  WANT_STANDALONE_GUI=no
+fi
+if [[ "$WANT_GTK" = "no" ]]; then
+  WANT_STANDALONE_GUI=no
+fi
+AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
 
 dnl We use ESD if possible.
 if [[ "x$WANT_ESD" = "xyes" ]]; then
@@ -432,8 +442,62 @@ AC_CHECK_FILE([/dev/ptc],
 )
 dnl (end of code from openssh-3.2.2p1 configure.ac)
 
+dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
+dnl doesn't work or is unimplemented. On these systems (mostly older
+dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
+AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
+  ac_cv_nonblocking_io, [
+  case "$host" in
+  *-*-osf*)
+    ac_cv_nonblocking_io=FIONBIO
+    ;;
+  *-*-sunos4*)
+    ac_cv_nonblocking_io=FIONBIO
+    ;;
+  *-*-ultrix*)
+    ac_cv_nonblocking_io=FIONBIO
+    ;;
+  *)
+    ac_cv_nonblocking_io=O_NONBLOCK
+    ;;
+  esac
+])
+if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
+  AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
+fi
+
+dnl Check whether compiler supports byte bit-fields
+AC_CACHE_CHECK([whether compiler supports byte bit-fields],
+  ac_cv_have_byte_bitfields, [
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_RUN([
+    struct A {
+      unsigned char b1:4;
+      unsigned char b2:4;
+      unsigned char c;
+      unsigned short s;
+      unsigned char a[4];
+    };
+
+    int main(void) {
+      A a;
+      return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
+    }],
+    [ac_cv_have_byte_bitfields=yes],
+    [ac_cv_have_byte_bitfields=no],
+    dnl When cross-compiling, assume only GCC supports this
+    [if [[ "$GCC" = "yes" ]]; then
+      ac_cv_have_byte_bitfields="guessing yes"
+    else
+      ac_cv_have_byte_bitfields="guessing no"
+    fi]
+    )
+  AC_LANG_RESTORE
+])
+
 dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
-AC_DEFUN(AC_CHECK_FRAMEWORK, [
+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, [
@@ -493,7 +557,6 @@ darwin*)
   fi
   ;;
 irix*)
-  ETHERSRC=ether_unix.cpp
   AUDIOSRC=Irix/audio_irix.cpp
   LIBS="$LIBS -laudio"
   WANT_ESD=no
@@ -512,7 +575,13 @@ irix*)
 esac
 
 dnl Is the slirp library supported?
-if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
+case "$ac_cv_have_byte_bitfields" in
+yes|"guessing yes")
+  CAN_SLIRP=yes
+  ETHERSRC=ether_unix.cpp
+  ;;
+esac
+if [[ -n "$CAN_SLIRP" ]]; then
   AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
   SLIRP_SRCS="\
     ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
@@ -554,7 +623,7 @@ dnl to be put into the config.h file
 dnl $1 -- the macro to define
 dnl $2 -- the value to translate
 dnl $3 -- template name
-AC_DEFUN(AC_TRANSLATE_DEFINE, [
+AC_DEFUN([AC_TRANSLATE_DEFINE], [
     if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
         AC_DEFINE($1, 1, $3)
     fi
@@ -1328,7 +1397,7 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
     if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
       case $host_cpu in
       i?86)
-        DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
+        DYNGEN_OP_FLAGS="-fomit-frame-pointer"
         ;;
       mips)
         DYNGEN_OP_FLAGS="-fno-delayed-branch -mno-abicalls"