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.25 by gbeauche, 2004-06-22T22:41:44Z vs.
Revision 1.26 by gbeauche, 2004-06-24T15:37:25Z

# 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])
19   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
20   AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
21   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
# Line 86 | Line 87 | fi
87   dnl Checks for libraries.
88   AC_CHECK_LIB(posix4, sem_init)
89  
90 < dnl We need X11.
91 < AC_PATH_XTRA
92 < if [[ "x$no_x" = "xyes" ]]; then
93 <  AC_MSG_ERROR([You need X11 to run SheepShaver.])
94 < fi
95 < CFLAGS="$CFLAGS $X_CFLAGS"
96 < CXXFLAGS="$CXXFLAGS $X_CFLAGS"
97 < LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
90 > dnl Do we need SDL?
91 > WANT_SDL=no
92 > SDL_SUPPORT="none"
93 > if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
94 >  WANT_SDL=yes
95 >  WANT_XF86_DGA=no
96 >  WANT_XF86_VIDMODE=no
97 >  WANT_FBDEV_DGA=no
98 >  SDL_SUPPORT="video"
99 > fi
100 > if [[ "x$WANT_SDL" = "xyes" ]]; then
101 >  AC_PATH_PROG(sdl_config, "sdl-config")
102 >  if [[ -n "$sdl_config" ]]; then
103 >    sdl_cflags=`$sdl_config --cflags`
104 >    sdl_libs=`$sdl_config --libs`
105 >    CFLAGS="$CFLAGS $sdl_cflags"
106 >    CXXFLAGS="$CXXFLAGS $sdl_cflags"
107 >    LIBS="$LIBS $sdl_libs"
108 >  else
109 >    WANT_SDL=no
110 >  fi
111 > fi
112 >
113 > dnl We need X11, if not using SDL.
114 > if [[ "x$WANT_SDL" = "xno" ]]; then
115 >  AC_PATH_XTRA
116 >  if [[ "x$no_x" = "xyes" ]]; then
117 >    AC_MSG_ERROR([You need X11 to run SheepShaver.])
118 >  fi
119 >  CFLAGS="$CFLAGS $X_CFLAGS"
120 >  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
121 >  LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
122 > fi
123  
124   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
125   HAVE_PTHREADS=yes
# Line 261 | Line 287 | darwin*)
287    fi
288    ;;
289   esac
290 < SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
290 >
291 > dnl SDL overrides
292 > if [[ "x$WANT_SDL" = "xyes" ]]; then
293 >  AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
294 > fi
295 > if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
296 >  VIDEOSRCS="../SDL/video_sdl.cpp ../dummy/clip_dummy.cpp"
297 >  AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
298 > else
299 >  VIDEOSRCS="video_x.cpp clip_unix.cpp"
300 > fi
301 >
302 > SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
303  
304   dnl Define a macro that translates a yesno-variable into a C macro definition
305   dnl to be put into the config.h file
# Line 837 | Line 875 | dnl Print summary.
875   echo
876   echo SheepShaver configuration summary:
877   echo
878 + echo SDL support ...................... : $SDL_SUPPORT
879   echo XFree86 DGA support .............. : $WANT_XF86_DGA
880   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
881   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines