--- SheepShaver/src/Unix/configure.ac	2005/07/10 15:43:33	1.37
+++ SheepShaver/src/Unix/configure.ac	2007/06/13 12:11:55	1.58
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Written in 2002 by Christian Bauer
 
-AC_INIT([SheepShaver], 2.2, [Christian.Bauer@uni-mainz.de], SheepShaver)
+AC_INIT([SheepShaver], 2.3, [Christian.Bauer@uni-mainz.de], SheepShaver)
 AC_CONFIG_SRCDIR(main_unix.cpp)
 AC_PREREQ(2.52)
 AC_CONFIG_HEADER(config.h)
@@ -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
@@ -105,7 +106,7 @@ if [[ "x$WANT_MON" = "xyes" ]]; then
   if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
     AC_MSG_RESULT(yes)
     AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
-    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
+    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c $mon_srcdir/disass/mips-dis.c $mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-opc.c"
     CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
     AC_CHECK_LIB(ncurses, tgetent, ,
       AC_CHECK_LIB(termcap, tgetent, ,
@@ -125,6 +126,7 @@ AC_SUBST(MONSRCS)
 
 dnl Checks for libraries.
 AC_CHECK_LIB(posix4, sem_init)
+AC_CHECK_LIB(m, cos)
 
 dnl Do we need SDL?
 WANT_SDL=no
@@ -243,12 +245,10 @@ dnl We use GTK+ if possible.
 UISRCS=../dummy/prefs_editor_dummy.cpp
 case "x$WANT_GTK" in
 xgtk2*)
+  WANT_GTK=no
   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
@@ -259,34 +259,48 @@ xgtk2*)
     *)
       AC_MSG_WARN([Could not find GTK+, disabling user interface.])
       WANT_GTK=no
-      ;;
+     ;;
     esac
   ])
   ;;
 esac
 if [[ "x$WANT_GTK" = "xgtk" ]]; then
+  WANT_GTK=no
   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"
+    WANT_GTK=gtk
   ], [
     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
+  WANT_ESD=no
   AM_PATH_ESD(0.2.8, [
     AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
     CFLAGS="$CFLAGS $ESD_CFLAGS"
     CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
     LIBS="$LIBS $ESD_LIBS"
+    WANT_ESD=yes
   ], [
     AC_MSG_WARN([Could not find ESD, disabling ESD support.])
-    WANT_ESD=no
   ])
 fi
 
@@ -431,15 +445,69 @@ 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, [
     saved_LIBS="$LIBS"
     LIBS="$LIBS -framework $1"
     AC_TRY_LINK(
-      [$2], [int main(void) { return 0; }],
+      [$2], [],
       [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
     )
   ])
@@ -491,10 +559,32 @@ darwin*)
     EXTFSSRC=../MacOSX/extfs_macosx.mm
   fi
   ;;
+irix*)
+  AUDIOSRC=Irix/audio_irix.cpp
+  LIBS="$LIBS -laudio"
+  WANT_ESD=no
+
+  dnl Check if our compiler supports -IPA (MIPSPro)
+  HAVE_IPA=no
+  ocflags="$CFLAGS"
+  CFLAGS=`echo " $CFLAGS -IPA" | sed -e "s/ -g //g"`
+  AC_MSG_CHECKING(if "-IPA" works)
+  dnl Do a test compile of an empty function
+  AC_TRY_COMPILE([#if defined __GNUC__
+                  # error GCC does not support IPA yet
+                  #endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
+  CFLAGS="$ocflags"
+  ;;
 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  \
@@ -536,7 +626,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
@@ -1178,6 +1268,7 @@ HAVE_GCC27=no
 AC_MSG_CHECKING(for GCC 2.7 or higher)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
                                      # error gcc < 2.7
+                                     typedef syntax error;
                                      #endif
                                    ]])],
                   [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
@@ -1188,6 +1279,7 @@ HAVE_GCC30=no
 AC_MSG_CHECKING(for GCC 3.0 or higher)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
                                      # error gcc < 3
+                                     typedef syntax error;
                                      #endif
                                    ]])],
                   [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
@@ -1235,8 +1327,8 @@ if [[ "x$HAVE_GCC30" = "xyes" ]]; then
   CFLAGS="$SAVED_CFLAGS"
 fi
 
-dnl Add -mdynamic-no-pic for MacOS X
-if [[ "x$HAVE_GCC30" = "xyes" ]]; then
+dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
+if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
   SAVED_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -mdynamic-no-pic"
   AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
@@ -1258,7 +1350,8 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
     ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
     ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
     ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
-    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
+    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
+    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
   CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
 
   dnl Enable JIT compiler, if possible
@@ -1275,9 +1368,15 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
       i?86:elf)
         ac_cv_use_dyngen=yes
         ;;
+      mips:elf)
+        ac_cv_use_dyngen=yes
+        ;;
       powerpc:mach)
         ac_cv_use_dyngen=yes
         ;;
+      i?86:mach)
+        ac_cv_use_dyngen=yes
+        ;;
       *:*)
         ac_cv_use_dyngen=no
         ;;
@@ -1287,7 +1386,7 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
         if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
           DYNGEN_CC=$CXX
         else
-          for p in /usr/bin /usr/local/bin; do
+          for p in /usr/bin /usr/local/bin /usr/freeware/bin; do
             gxx="$p/g++"
             if [[ -x "$gxx" ]]; then
               DYNGEN_CC="$gxx"
@@ -1302,7 +1401,10 @@ 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"
         ;;
       powerpc)
         if [[ "x$ac_cv_object_format" = "xmach" ]]; then
@@ -1310,15 +1412,27 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
         fi
         ;;
       esac
-      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
-        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
+      have_dyngen_gcc3=no
+      case "x`$DYNGEN_CC -dumpversion`" in
+      x[12].*) ;;
+      x*) have_dyngen_gcc3=yes ;;
+      esac
+      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
+        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
       else
         DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
       fi
-      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
-      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
+      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
+      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
         DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
       fi
+      if [[ "x$DYNGEN_CC" != "x$CXX" ]]; then
+        DYNGEN_CFLAGS="-O2 $CFLAGS"
+        DYNGEN_CXXFLAGS="-O2 $CXXFLAGS"
+      else
+        DYNGEN_CFLAGS="\$(CFLAGS)"
+        DYNGEN_CXXFLAGS="\$(CXXFLAGS)"
+      fi
     else
       WANT_JIT=no
     fi
@@ -1330,48 +1444,66 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
       CPUSRCS="\
         ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
         ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
-        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
+        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
+        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
     fi
   fi
   CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
 else
   WANT_JIT=no
 fi
-if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
-  AC_CACHE_CHECK([whether static data regions are executable],
-    ac_cv_have_static_data_exec, [
-    AC_TRY_RUN([int main(void) {
-#if defined(__powerpc__) || defined(__ppc__)
-      static unsigned int p[8] = {0x4e800020,};
-      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
-      asm volatile("sync" : : : "memory");
-      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
-      asm volatile("sync" : : : "memory");
-      asm volatile("isync" : : : "memory");
-      ((void (*)(void))p)();
-      return 0;
-#endif
-      return 1;
-    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
-    dnl When cross-compiling, do not assume anything.
-    ac_cv_have_static_data_exec=no
-    )
-  ])
-else
-  ac_cv_use_dyngen=no
-fi
-AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
-  [Define if your system marks static data pages as executable.])
-
 if [[ "x$WANT_JIT" = "xyes" ]]; then
   CPPFLAGS="$CPPFLAGS -DUSE_JIT"
 fi
 
+dnl Higher level optimizations with MIPSPro compilers are possible
+if [[ "x$HAVE_IPA" = "xyes" ]]; then
+  CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
+  CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
+  CXXFLAGS="-LANG:std $CXXFLAGS"
+  LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
+fi
+
+dnl Check for linker script support
+case $target_os:$target_cpu in
+linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
+linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
+linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
+netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
+freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
+darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
+esac
+if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
+  AC_CACHE_CHECK([whether linker script is usable],
+    ac_cv_linker_script_works, [
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    saved_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
+    AC_TRY_RUN(
+      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
+      [ac_cv_linker_script_works=yes],
+      [ac_cv_linker_script_works=no],
+      dnl When cross-compiling, assume it works
+      [ac_cv_linker_script_works="guessing yes"]
+    )
+    AC_LANG_RESTORE
+    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
+      LDFLAGS="$saved_LDFLAGS"
+      LINKER_SCRIPT_FLAGS=""
+    fi
+  ])
+fi
+AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
+  [Define if there is a linker script to relocate the executable above 0x70000000.])
+
 dnl Generate Makefile.
 AC_SUBST(PERL)
 AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
 AC_SUBST(DYNGENSRCS)
 AC_SUBST(DYNGEN_CC)
+AC_SUBST(DYNGEN_CFLAGS)
+AC_SUBST(DYNGEN_CXXFLAGS)
 AC_SUBST(DYNGEN_OP_FLAGS)
 AC_SUBST(SYSSRCS)
 AC_SUBST(CPUSRCS)