ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/configure.ac
(Generate patch)

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.5 by gbeauche, 2004-07-07T04:13:37Z vs.
Revision 1.7 by gbeauche, 2004-07-19T19:42:21Z

# Line 28 | Line 28 | AC_ARG_WITH(dgcc,           [  --with-dg
28   dnl SDL options.
29   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
30   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
31 + AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
32  
33   dnl Checks for programs.
34   AC_PROG_CC
# Line 98 | Line 99 | AC_CHECK_LIB(posix4, sem_init)
99  
100   dnl Do we need SDL?
101   WANT_SDL=no
101 SDL_SUPPORT="none"
102   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
103    WANT_SDL=yes
104    WANT_XF86_DGA=no
105    WANT_XF86_VIDMODE=no
106    WANT_FBDEV_DGA=no
107 <  SDL_SUPPORT="video"
107 >  SDL_SUPPORT="$SDL_SUPPORT video"
108 > fi
109 > if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
110 >  WANT_SDL=yes
111 >  SDL_SUPPORT="$SDL_SUPPORT audio"
112   fi
113   if [[ "x$WANT_SDL" = "xyes" ]]; then
114    AC_PATH_PROG(sdl_config, "sdl-config")
# Line 121 | Line 125 | if [[ "x$WANT_SDL" = "xyes" ]]; then
125    else
126      WANT_SDL=no
127    fi
128 +  SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
129 + else
130 +  SDL_SUPPORT="none"
131   fi
132  
133   dnl We need X11, if not using SDL.
# Line 314 | Line 321 | SERIALSRC=serial_unix.cpp
321   ETHERSRC=../dummy/ether_dummy.cpp
322   SCSISRC=../dummy/scsi_dummy.cpp
323   AUDIOSRC=../dummy/audio_dummy.cpp
324 + EXTFSSRC=extfs_unix.cpp
325   EXTRASYSSRCS=
326   case "$target_os" in
327   linux*)
# Line 331 | Line 339 | darwin*)
339    if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
340      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
341    fi
342 +  if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
343 +    EXTFSSRC=../MacOSX/extfs_macosx.mm
344 +  fi
345    ;;
346   esac
347  
# Line 339 | Line 350 | if [[ "x$WANT_SDL" = "xyes" ]]; then
350    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
351   fi
352   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
342  VIDEOSRCS="../SDL/video_sdl.cpp"
353    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
354 +  VIDEOSRCS="../SDL/video_sdl.cpp"
355    KEYCODES="../SDL/keycodes"
356    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
357      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
# Line 352 | Line 363 | else
363    KEYCODES="keycodes"
364    EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
365   fi
366 + if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
367 +  AC_DEFINE(USE_SDL_AUDIO, 1, [Define to enable SDL audio support])
368 +  AUDIOSRC="../SDL/audio_sdl.cpp"
369 + fi
370  
371 < SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
371 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
372  
373   dnl Define a macro that translates a yesno-variable into a C macro definition
374   dnl to be put into the config.h file

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines