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.18 by gbeauche, 2005-03-05T19:07:35Z vs.
Revision 1.21 by gbeauche, 2005-03-27T19:05:18Z

# Line 17 | Line 17 | ulimit -c 0
17   dnl Options.
18   AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
19   AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
20 + AC_ARG_ENABLE(fbdev-dga,    [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb0 [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
21   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
22   AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
23   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
24   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
25 < AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
25 > AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
26 >  [case "$withval" in
27 >   gtk1)      WANT_GTK="gtk";;
28 >   gtk|gtk2)  WANT_GTK="$withval";;
29 >   yes)       WANT_GTK="gtk2 gtk";;
30 >   *)         WANT_GTK="no";;
31 >   esac],
32 >  [WANT_GTK="gtk2 gtk"])
33   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
34   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
35  
# Line 115 | Line 123 | dnl Do we need SDL?
123   WANT_SDL=no
124   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
125    WANT_SDL=yes
126 +  WANT_FBDEV_DGA=no
127    WANT_XF86_DGA=no
128    WANT_XF86_VIDMODE=no
129    WANT_FBDEV_DGA=no
# Line 198 | Line 207 | no:linux*|no:netbsd*)
207    ;;
208   esac
209  
210 + dnl We use FBDev DGA if possible.
211 + if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
212 +  AC_CHECK_HEADER(linux/fb.h, [
213 +    AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
214 +  ], [
215 +    AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
216 +    WANT_FBDEV_DGA=no
217 +  ])
218 + fi
219 +
220   dnl We use XFree86 DGA if possible.
221   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
222    AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, [
# Line 222 | Line 241 | fi
241  
242   dnl We use GTK+ if possible.
243   UISRCS=../dummy/prefs_editor_dummy.cpp
244 < if [[ "x$WANT_GTK" = "xyes" ]]; then
244 > case "x$WANT_GTK" in
245 > xgtk2*)
246 >  AM_PATH_GTK_2_0(1.3.15, [
247 >    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
248 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
249 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
250 >    LIBS="$LIBS $GTK_LIBS"
251 >    UISRCS=prefs_editor_gtk.cpp
252 >    WANT_GTK=gtk2
253 >  ], [
254 >    case "x${WANT_GTK}x" in
255 >    *gtkx)
256 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
257 >      WANT_GTK=gtk
258 >      ;;
259 >    *)
260 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
261 >      WANT_GTK=no
262 >      ;;
263 >    esac
264 >  ])
265 >  ;;
266 > esac
267 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
268    AM_PATH_GTK(1.2.0, [
269      AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
270      CFLAGS="$CFLAGS $GTK_CFLAGS"
# Line 1063 | Line 1105 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1105          else
1106            DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1107          fi
1066 –        saved_CPPFLAGS=$CPPFLAGS
1067 –        CPPFLAGS="$CPPFLAGS -mmmx"
1068 –        AC_CHECK_HEADERS(mmintrin.h,  [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -mmmx"])
1069 –        CPPFLAGS="$CPPFLAGS -msse"
1070 –        AC_CHECK_HEADERS(xmmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse"])
1071 –        CPPFLAGS="$CPPFLAGS -msse2"
1072 –        AC_CHECK_HEADERS(emmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse2"])
1073 –        CPPFLAGS=$saved_CPPFLAGS
1074 –        ;;
1075 –      x86_64)
1076 –        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1108          ;;
1109        esac
1110        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -g0"
# Line 1148 | Line 1179 | echo
1179   echo SheepShaver configuration summary:
1180   echo
1181   echo SDL support ...................... : $SDL_SUPPORT
1182 + echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1183   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1184   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1185   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines