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.27 by gbeauche, 2004-06-24T16:13:53Z vs.
Revision 1.30 by gbeauche, 2004-06-27T22:12:52Z

# Line 15 | Line 15 | AC_ARG_ENABLE(ppc-emulator, [  --enable-
15   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
16   AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
17   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
18 AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
18   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
19   AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
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 101 | Line 104 | 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 <    sdl_libs=`$sdl_config --libs`
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"
# Line 266 | Line 273 | no:linux*)
273    ;;
274   esac
275  
276 + dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
277 + AC_DEFUN(AC_CHECK_FRAMEWORK, [
278 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
279 +  AC_CACHE_CHECK([whether compiler supports framework $1],
280 +    ac_Framework, [
281 +    saved_LIBS="$LIBS"
282 +    LIBS="$LIBS -framework $1"
283 +    AC_TRY_LINK(
284 +      [$2], [int main(void) { return 0; }],
285 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
286 +    )
287 +  ])
288 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
289 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
290 +  )
291 +  AS_VAR_POPDEF([ac_Framework])dnl
292 + ])
293 +
294 + dnl Check for some MacOS X frameworks
295 + AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
296 + AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
297 +
298   dnl Select system-dependant sources.
299   SERIALSRC=serial_unix.cpp
300   ETHERSRC=../dummy/ether_dummy.cpp
# Line 285 | Line 314 | darwin*)
314    if [[ "x$EMULATED_PPC" = "xno" ]]; then
315      EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
316    fi
317 +  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
318 +    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
319 +  fi
320    ;;
321   esac
322  
# Line 293 | Line 325 | if [[ "x$WANT_SDL" = "xyes" ]]; then
325    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
326   fi
327   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
328 <  VIDEOSRCS="../SDL/video_sdl.cpp ../dummy/clip_dummy.cpp"
328 >  VIDEOSRCS="../SDL/video_sdl.cpp"
329    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
330 +  KEYCODES="../SDL/keycodes"
331 +  if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
332 +    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
333 +  else
334 +    EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
335 +  fi
336   else
337 <  VIDEOSRCS="video_x.cpp clip_unix.cpp"
337 >  VIDEOSRCS="video_x.cpp"
338 >  KEYCODES="keycodes"
339 >  EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
340   fi
341  
342   SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
# Line 680 | Line 720 | dnl Can we do Video on SEGV Signals ?
720   CAN_VOSF=no
721   if [[ -n "$sigsegv_recovery" ]]; then
722    CAN_VOSF=yes
683  case $target_os in
684  darwin*)
685    dnl Signal handlers in darwin are way too slow since the whole
686    dnl machine state (GPRs, FPRs, VRs) is forcibly saved.
687    dnl In other words, VOSF is slower than static window refreshes.
688    CAN_VOSF=no
689    ;;
690  esac
723   fi
724  
725   dnl Enable VOSF screen updates with this feature is requested and feasible
# Line 869 | Line 901 | AC_SUBST(DYNGEN_OP_FLAGS)
901   AC_SUBST(SYSSRCS)
902   AC_SUBST(CPUSRCS)
903   AC_SUBST(BLESS)
904 + AC_SUBST(KEYCODES)
905   AC_OUTPUT(Makefile)
906  
907   dnl Print summary.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines