--- SheepShaver/src/Unix/configure.ac	2004/06/30 08:48:45	1.2
+++ SheepShaver/src/Unix/configure.ac	2004/07/19 19:42:21	1.7
@@ -28,6 +28,7 @@ AC_ARG_WITH(dgcc,           [  --with-dg
 dnl SDL options.
 AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
 AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
+AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -35,6 +36,7 @@ AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_PROG_EGREP
 
 dnl Check for PowerPC target CPU.
 HAVE_PPC=no
@@ -97,13 +99,16 @@ AC_CHECK_LIB(posix4, sem_init)
 
 dnl Do we need SDL?
 WANT_SDL=no
-SDL_SUPPORT="none"
 if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
   WANT_SDL=yes
   WANT_XF86_DGA=no
   WANT_XF86_VIDMODE=no
   WANT_FBDEV_DGA=no
-  SDL_SUPPORT="video"
+  SDL_SUPPORT="$SDL_SUPPORT video"
+fi
+if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
+  WANT_SDL=yes
+  SDL_SUPPORT="$SDL_SUPPORT audio"
 fi
 if [[ "x$WANT_SDL" = "xyes" ]]; then
   AC_PATH_PROG(sdl_config, "sdl-config")
@@ -120,6 +125,9 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
   else
     WANT_SDL=no
   fi
+  SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
+else
+  SDL_SUPPORT="none"
 fi
 
 dnl We need X11, if not using SDL.
@@ -223,7 +231,7 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
 AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
-AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h)
+AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
 AC_CHECK_HEADERS(linux/if.h, [], [], [
 #if HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
@@ -313,6 +321,7 @@ SERIALSRC=serial_unix.cpp
 ETHERSRC=../dummy/ether_dummy.cpp
 SCSISRC=../dummy/scsi_dummy.cpp
 AUDIOSRC=../dummy/audio_dummy.cpp
+EXTFSSRC=extfs_unix.cpp
 EXTRASYSSRCS=
 case "$target_os" in
 linux*)
@@ -330,6 +339,9 @@ darwin*)
   if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
     EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
   fi
+  if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
+    EXTFSSRC=../MacOSX/extfs_macosx.mm
+  fi
   ;;
 esac
 
@@ -338,8 +350,8 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
   AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
 fi
 if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
-  VIDEOSRCS="../SDL/video_sdl.cpp"
   AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
+  VIDEOSRCS="../SDL/video_sdl.cpp"
   KEYCODES="../SDL/keycodes"
   if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
     EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
@@ -351,8 +363,12 @@ else
   KEYCODES="keycodes"
   EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
 fi
+if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
+  AC_DEFINE(USE_SDL_AUDIO, 1, [Define to enable SDL audio support])
+  AUDIOSRC="../SDL/audio_sdl.cpp"
+fi
 
-SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
+SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
 
 dnl Define a macro that translates a yesno-variable into a C macro definition
 dnl to be put into the config.h file
@@ -915,7 +931,10 @@ AC_SUBST(SYSSRCS)
 AC_SUBST(CPUSRCS)
 AC_SUBST(BLESS)
 AC_SUBST(KEYCODES)
-AC_OUTPUT(Makefile)
+AC_OUTPUT([
+Makefile
+../MacOSX/Info.plist
+])
 
 dnl Print summary.
 echo