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

Comparing SheepShaver/src/Unix/configure.in (file contents):
Revision 1.24 by gbeauche, 2004-05-09T17:44:17Z vs.
Revision 1.28 by gbeauche, 2004-06-24T16:32:12Z

# Line 20 | Line 20 | AC_ARG_WITH(gtk,            [  --with-gt
20   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
21   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
22  
23 + dnl SDL options.
24 + AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
25 + AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
26 +
27   dnl Checks for programs.
28   AC_PROG_CC
29   AC_PROG_CPP
# Line 86 | Line 90 | fi
90   dnl Checks for libraries.
91   AC_CHECK_LIB(posix4, sem_init)
92  
93 < dnl We need X11.
94 < AC_PATH_XTRA
95 < if [[ "x$no_x" = "xyes" ]]; then
96 <  AC_MSG_ERROR([You need X11 to run SheepShaver.])
97 < fi
98 < CFLAGS="$CFLAGS $X_CFLAGS"
99 < CXXFLAGS="$CXXFLAGS $X_CFLAGS"
100 < LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
93 > dnl Do we need SDL?
94 > WANT_SDL=no
95 > SDL_SUPPORT="none"
96 > if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
97 >  WANT_SDL=yes
98 >  WANT_XF86_DGA=no
99 >  WANT_XF86_VIDMODE=no
100 >  WANT_FBDEV_DGA=no
101 >  SDL_SUPPORT="video"
102 > fi
103 > if [[ "x$WANT_SDL" = "xyes" ]]; then
104 >  AC_PATH_PROG(sdl_config, "sdl-config")
105 >  if [[ -n "$sdl_config" ]]; then
106 >    sdl_cflags=`$sdl_config --cflags`
107 >    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
108 >      sdl_libs=`$sdl_config --static-libs`
109 >    else
110 >      sdl_libs=`$sdl_config --libs`
111 >    fi
112 >    CFLAGS="$CFLAGS $sdl_cflags"
113 >    CXXFLAGS="$CXXFLAGS $sdl_cflags"
114 >    LIBS="$LIBS $sdl_libs"
115 >  else
116 >    WANT_SDL=no
117 >  fi
118 > fi
119 >
120 > dnl We need X11, if not using SDL.
121 > if [[ "x$WANT_SDL" = "xno" ]]; then
122 >  AC_PATH_XTRA
123 >  if [[ "x$no_x" = "xyes" ]]; then
124 >    AC_MSG_ERROR([You need X11 to run SheepShaver.])
125 >  fi
126 >  CFLAGS="$CFLAGS $X_CFLAGS"
127 >  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
128 >  LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
129 > fi
130  
131   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
132   HAVE_PTHREADS=yes
# Line 219 | Line 252 | if [[ "x$ac_cv_signal_sa_restorer" = "xy
252   fi
253  
254   dnl Checks for library functions.
255 < AC_CHECK_FUNCS(strdup cfmakeraw)
255 > AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
256   AC_CHECK_FUNCS(nanosleep)
257   AC_CHECK_FUNCS(sigaction signal)
258   AC_CHECK_FUNCS(mmap mprotect munmap)
# Line 261 | Line 294 | darwin*)
294    fi
295    ;;
296   esac
297 < SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
297 >
298 > dnl SDL overrides
299 > if [[ "x$WANT_SDL" = "xyes" ]]; then
300 >  AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
301 > fi
302 > if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
303 >  VIDEOSRCS="../SDL/video_sdl.cpp ../dummy/clip_dummy.cpp"
304 >  AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
305 > else
306 >  VIDEOSRCS="video_x.cpp clip_unix.cpp"
307 > fi
308 >
309 > SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
310  
311   dnl Define a macro that translates a yesno-variable into a C macro definition
312   dnl to be put into the config.h file
# Line 642 | Line 687 | dnl Can we do Video on SEGV Signals ?
687   CAN_VOSF=no
688   if [[ -n "$sigsegv_recovery" ]]; then
689    CAN_VOSF=yes
690 +  case $target_os in
691 +  darwin*)
692 +    dnl Signal handlers in darwin are way too slow since the whole
693 +    dnl machine state (GPRs, FPRs, VRs) is forcibly saved.
694 +    dnl In other words, VOSF is slower than static window refreshes.
695 +    CAN_VOSF=no
696 +    ;;
697 +  esac
698   fi
699  
700   dnl Enable VOSF screen updates with this feature is requested and feasible
# Line 652 | Line 705 | else
705   fi
706  
707   dnl Platform specific binary postprocessor
708 < BLESS=/bin/true
708 > AC_PATH_PROG(BLESS, "true")
709   if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
710    BLESS=Darwin/lowmem
711    LDFLAGS="$LDFLAGS -pagezero_size 0x3000"
# Line 829 | Line 882 | dnl Print summary.
882   echo
883   echo SheepShaver configuration summary:
884   echo
885 + echo SDL support ...................... : $SDL_SUPPORT
886   echo XFree86 DGA support .............. : $WANT_XF86_DGA
887   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
888   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines