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.25 by gbeauche, 2005-06-14T06:35:00Z

# 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])
22 > AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
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 198 | Line 206 | no:linux*|no:netbsd*)
206    ;;
207   esac
208  
209 + dnl We use FBDev DGA if possible.
210 + if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
211 +  AC_CHECK_HEADER(linux/fb.h, [
212 +    AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
213 +  ], [
214 +    AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
215 +    WANT_FBDEV_DGA=no
216 +  ])
217 + fi
218 +
219   dnl We use XFree86 DGA if possible.
220   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
221    AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, [
# Line 222 | Line 240 | fi
240  
241   dnl We use GTK+ if possible.
242   UISRCS=../dummy/prefs_editor_dummy.cpp
243 < if [[ "x$WANT_GTK" = "xyes" ]]; then
243 > case "x$WANT_GTK" in
244 > xgtk2*)
245 >  AM_PATH_GTK_2_0(1.3.15, [
246 >    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
247 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
248 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
249 >    LIBS="$LIBS $GTK_LIBS"
250 >    UISRCS=prefs_editor_gtk.cpp
251 >    WANT_GTK=gtk2
252 >  ], [
253 >    case "x${WANT_GTK}x" in
254 >    *gtkx)
255 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
256 >      WANT_GTK=gtk
257 >      ;;
258 >    *)
259 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
260 >      WANT_GTK=no
261 >      ;;
262 >    esac
263 >  ])
264 >  ;;
265 > esac
266 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
267    AM_PATH_GTK(1.2.0, [
268      AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
269      CFLAGS="$CFLAGS $GTK_CFLAGS"
# Line 992 | Line 1033 | fi
1033   AC_MSG_RESULT($HAVE_ICC)
1034  
1035   dnl Determine the generated object format
1036 < AC_CACHE_CHECK([whether the compiler can generate ELF objects],
1036 > AC_CACHE_CHECK([the format of compiler generated objects],
1037    ac_cv_object_format, [
1038    echo 'int i;' > conftest.$ac_ext
1039    ac_cv_object_format=no
# Line 1001 | Line 1042 | AC_CACHE_CHECK([whether the compiler can
1042      *"ELF"*)
1043        ac_cv_object_format=elf
1044        ;;
1045 +    *"Mach-O"*)
1046 +      ac_cv_object_format=mach
1047 +      ;;
1048      *)
1049        ac_cv_object_format=unknown
1050        ;;
# Line 1033 | Line 1077 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1077        i?86:elf)
1078          ac_cv_use_dyngen=yes
1079          ;;
1080 +      powerpc:mach)
1081 +        ac_cv_use_dyngen=yes
1082 +        ;;
1083        *:*)
1084          ac_cv_use_dyngen=no
1085          ;;
# Line 1058 | Line 1105 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1105        case $host_cpu in
1106        i?86)
1107          DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
1061 –        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1062 –          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1063 –        else
1064 –          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1065 –        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
1108          ;;
1109 <      x86_64)
1110 <        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1109 >      powerpc)
1110 >        if [[ "x$ac_cv_object_format" = "xmach" ]]; then
1111 >          DYNGEN_OP_FLAGS="-mdynamic-no-pic"
1112 >        fi
1113          ;;
1114        esac
1115 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -g0"
1115 >      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1116 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1117 >      else
1118 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1119 >      fi
1120 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
1121        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1122          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1123        fi
# Line 1102 | Line 1143 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1143    AC_CACHE_CHECK([whether static data regions are executable],
1144      ac_cv_have_static_data_exec, [
1145      AC_TRY_RUN([int main(void) {
1146 < #if defined(__powerpc__)
1146 > #if defined(__powerpc__) || defined(__ppc__)
1147        static unsigned int p[8] = {0x4e800020,};
1148        asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1149        asm volatile("sync" : : : "memory");
# Line 1148 | Line 1189 | echo
1189   echo SheepShaver configuration summary:
1190   echo
1191   echo SDL support ...................... : $SDL_SUPPORT
1192 + echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1193   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1194   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1195   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

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