--- SheepShaver/src/Unix/configure.ac	2006/07/06 00:07:47	1.53
+++ SheepShaver/src/Unix/configure.ac	2008/11/21 01:09:28	1.62
@@ -106,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, ,
@@ -245,6 +245,7 @@ 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, [
     GUI_CFLAGS="$GTK_CFLAGS"
     GUI_LIBS="$GTK_LIBS"
@@ -258,18 +259,19 @@ 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, [
     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
@@ -290,14 +292,15 @@ AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
 
 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
 
@@ -422,6 +425,9 @@ mips-sony-bsd|mips-sony-newsos4)
 *-*-cygwin*)
 	no_dev_ptmx=1
 	;;
+*-*-darwin*)
+	no_dev_ptmx=1
+	;;
 esac
 
 if test -z "$no_dev_ptmx" ; then
@@ -518,12 +524,16 @@ dnl Check for some MacOS X frameworks
 AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
 AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
 AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
+AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
+AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
+AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
 
 dnl Select system-dependant sources.
 SERIALSRC=serial_unix.cpp
 ETHERSRC=../dummy/ether_dummy.cpp
 SCSISRC=../dummy/scsi_dummy.cpp
 AUDIOSRC=../dummy/audio_dummy.cpp
+PREFSSRC=../dummy/prefs_dummy.cpp
 EXTFSSRC=extfs_unix.cpp
 EXTRASYSSRCS=
 case "$target_os" in
@@ -553,7 +563,12 @@ darwin*)
     EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
   fi
   if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
-    EXTFSSRC=../MacOSX/extfs_macosx.mm
+    EXTFSSRC=../MacOSX/extfs_macosx.cpp
+    PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
+    CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
+ fi
+  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" ]]; then
+    AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
   fi
   ;;
 irix*)
@@ -616,7 +631,7 @@ if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
   AUDIOSRC="../SDL/audio_sdl.cpp"
 fi
 
-SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
+SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
 
 dnl Define a macro that translates a yesno-variable into a C macro definition
 dnl to be put into the config.h file
@@ -1347,7 +1362,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
@@ -1440,39 +1456,14 @@ 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