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.53 by gbeauche, 2006-07-06T00:07:47Z vs.
Revision 1.57 by gbeauche, 2007-06-13T12:09:05Z

# Line 245 | Line 245 | dnl We use GTK+ if possible.
245   UISRCS=../dummy/prefs_editor_dummy.cpp
246   case "x$WANT_GTK" in
247   xgtk2*)
248 +  WANT_GTK=no
249    AM_PATH_GTK_2_0(1.3.15, [
250      GUI_CFLAGS="$GTK_CFLAGS"
251      GUI_LIBS="$GTK_LIBS"
# Line 258 | Line 259 | xgtk2*)
259      *)
260        AC_MSG_WARN([Could not find GTK+, disabling user interface.])
261        WANT_GTK=no
262 <      ;;
262 >     ;;
263      esac
264    ])
265    ;;
266   esac
267   if [[ "x$WANT_GTK" = "xgtk" ]]; then
268 +  WANT_GTK=no
269    AM_PATH_GTK(1.2.0, [
270      GUI_CFLAGS="$GTK_CFLAGS"
271      GUI_LIBS="$GTK_LIBS"
272 +    WANT_GTK=gtk
273    ], [
274      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
272    WANT_GTK=no
275    ])
276   fi
277   if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
# Line 290 | Line 292 | AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
292  
293   dnl We use ESD if possible.
294   if [[ "x$WANT_ESD" = "xyes" ]]; then
295 +  WANT_ESD=no
296    AM_PATH_ESD(0.2.8, [
297      AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
298      CFLAGS="$CFLAGS $ESD_CFLAGS"
299      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
300      LIBS="$LIBS $ESD_LIBS"
301 +    WANT_ESD=yes
302    ], [
303      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
300    WANT_ESD=no
304    ])
305   fi
306  
# Line 1347 | Line 1350 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1350      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1351      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1352      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1353 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1353 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1354 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1355    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1356  
1357    dnl Enable JIT compiler, if possible
# Line 1440 | Line 1444 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1444        CPUSRCS="\
1445          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1446          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1447 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1447 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1448 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1449      fi
1450    fi
1451    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1452   else
1453    WANT_JIT=no
1454   fi
1450 if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1451  AC_CACHE_CHECK([whether static data regions are executable],
1452    ac_cv_have_static_data_exec, [
1453    AC_TRY_RUN([int main(void) {
1454 #if defined(__powerpc__) || defined(__ppc__)
1455      static unsigned int p[8] = {0x4e800020,};
1456      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1457      asm volatile("sync" : : : "memory");
1458      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1459      asm volatile("sync" : : : "memory");
1460      asm volatile("isync" : : : "memory");
1461      ((void (*)(void))p)();
1462      return 0;
1463 #endif
1464      return 1;
1465    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1466    dnl When cross-compiling, do not assume anything.
1467    ac_cv_have_static_data_exec=no
1468    )
1469  ])
1470 else
1471  ac_cv_use_dyngen=no
1472 fi
1473 AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1474  [Define if your system marks static data pages as executable.])
1475
1455   if [[ "x$WANT_JIT" = "xyes" ]]; then
1456    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1457   fi

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines