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.56 by asvitkine, 2007-01-24T14:33:52Z

# 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 +  ifdef([AM_PATH_GTK_2_0],
250    AM_PATH_GTK_2_0(1.3.15, [
251      GUI_CFLAGS="$GTK_CFLAGS"
252      GUI_LIBS="$GTK_LIBS"
# Line 258 | Line 260 | xgtk2*)
260      *)
261        AC_MSG_WARN([Could not find GTK+, disabling user interface.])
262        WANT_GTK=no
263 <      ;;
263 >     ;;
264      esac
265 <  ])
264 <  ;;
265 >  ]))
266   esac
267   if [[ "x$WANT_GTK" = "xgtk" ]]; then
268 +  WANT_GTK=no
269 +  ifdef([AM_PATH_GTK],
270    AM_PATH_GTK(1.2.0, [
271      GUI_CFLAGS="$GTK_CFLAGS"
272      GUI_LIBS="$GTK_LIBS"
273 +    WANT_GTK=gtk
274    ], [
275      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
276 <    WANT_GTK=no
273 <  ])
276 >  ]))
277   fi
278   if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
279    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
# Line 290 | Line 293 | AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
293  
294   dnl We use ESD if possible.
295   if [[ "x$WANT_ESD" = "xyes" ]]; then
296 +  WANT_ESD=no
297 +  ifdef([AM_PATH_ESD],
298    AM_PATH_ESD(0.2.8, [
299      AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
300      CFLAGS="$CFLAGS $ESD_CFLAGS"
301      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
302      LIBS="$LIBS $ESD_LIBS"
303 +    WANT_ESD=yes
304    ], [
305      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
306 <    WANT_ESD=no
301 <  ])
306 >  ]))
307   fi
308  
309   dnl We use 64-bit file size support if possible.
# Line 1347 | Line 1352 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1352      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1353      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1354      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1355 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1355 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1356 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1357    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1358  
1359    dnl Enable JIT compiler, if possible
# Line 1440 | Line 1446 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1446        CPUSRCS="\
1447          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1448          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1449 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1449 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1450 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1451      fi
1452    fi
1453    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1454   else
1455    WANT_JIT=no
1456   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
1457   if [[ "x$WANT_JIT" = "xyes" ]]; then
1458    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1459   fi

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines