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.28 by gbeauche, 2004-06-24T16:32:12Z

# 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"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines