--- SheepShaver/src/Unix/configure.ac	2007/06/13 16:34:13	1.59
+++ SheepShaver/src/Unix/configure.ac	2009/02/11 19:22:16	1.63
@@ -425,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
@@ -524,12 +527,14 @@ AC_CHECK_FRAMEWORK(CoreFoundation, [#inc
 AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
 AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
 AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
+AC_CHECK_FRAMEWORK(AppKit, [])
 
 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
@@ -559,9 +564,13 @@ 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
+    if [[ "x$ac_cv_framework_AppKit" = "xyes" ]]; then
+      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
+      CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
+    fi
   fi
-  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" ]]; then
+  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
     AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
   fi
   ;;
@@ -625,7 +634,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