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.49 by gbeauche, 2006-04-06T22:36:43Z vs.
Revision 1.55 by gbeauche, 2006-07-16T12:47:38Z

# Line 28 | Line 28 | AC_ARG_ENABLE(fbdev-dga,    [  --enable-
28   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
29   AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
30   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
31 + AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
32   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
33   AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
34    [case "$withval" in
# Line 245 | Line 246 | UISRCS=../dummy/prefs_editor_dummy.cpp
246   case "x$WANT_GTK" in
247   xgtk2*)
248    AM_PATH_GTK_2_0(1.3.15, [
249 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
250 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
250 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
251 <    LIBS="$LIBS $GTK_LIBS"
252 <    UISRCS=prefs_editor_gtk.cpp
249 >    GUI_CFLAGS="$GTK_CFLAGS"
250 >    GUI_LIBS="$GTK_LIBS"
251      WANT_GTK=gtk2
252    ], [
253      case "x${WANT_GTK}x" in
# Line 267 | Line 265 | xgtk2*)
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"
272 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
273 <    LIBS="$LIBS $GTK_LIBS"
274 <    UISRCS=prefs_editor_gtk.cpp
268 >    GUI_CFLAGS="$GTK_CFLAGS"
269 >    GUI_LIBS="$GTK_LIBS"
270    ], [
271      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
272      WANT_GTK=no
273    ])
274   fi
275 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
276 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
277 +  UISRCS=prefs_editor_gtk.cpp
278 + fi
279 + AC_SUBST(GUI_CFLAGS)
280 + AC_SUBST(GUI_LIBS)
281 +
282 + dnl Build external GUI if requested.
283 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
284 +  WANT_STANDALONE_GUI=no
285 + fi
286 + if [[ "$WANT_GTK" = "no" ]]; then
287 +  WANT_STANDALONE_GUI=no
288 + fi
289 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
290  
291   dnl We use ESD if possible.
292   if [[ "x$WANT_ESD" = "xyes" ]]; then
# Line 1337 | Line 1347 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1347      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1348      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1349      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1350 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1350 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1351 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1352    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1353  
1354    dnl Enable JIT compiler, if possible
# Line 1404 | Line 1415 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1415        x*) have_dyngen_gcc3=yes ;;
1416        esac
1417        if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1418 <        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1418 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1419        else
1420          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1421        fi
# Line 1430 | Line 1441 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1441        CPUSRCS="\
1442          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1443          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1444 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1444 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1445 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1446      fi
1447    fi
1448    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1449   else
1450    WANT_JIT=no
1451   fi
1440 – if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1441 –  AC_CACHE_CHECK([whether static data regions are executable],
1442 –    ac_cv_have_static_data_exec, [
1443 –    AC_TRY_RUN([int main(void) {
1444 – #if defined(__powerpc__) || defined(__ppc__)
1445 –      static unsigned int p[8] = {0x4e800020,};
1446 –      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1447 –      asm volatile("sync" : : : "memory");
1448 –      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1449 –      asm volatile("sync" : : : "memory");
1450 –      asm volatile("isync" : : : "memory");
1451 –      ((void (*)(void))p)();
1452 –      return 0;
1453 – #endif
1454 –      return 1;
1455 –    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1456 –    dnl When cross-compiling, do not assume anything.
1457 –    ac_cv_have_static_data_exec=no
1458 –    )
1459 –  ])
1460 – else
1461 –  ac_cv_use_dyngen=no
1462 – fi
1463 – AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1464 –  [Define if your system marks static data pages as executable.])
1465 –
1452   if [[ "x$WANT_JIT" = "xyes" ]]; then
1453    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1454   fi
# Line 1475 | Line 1461 | if [[ "x$HAVE_IPA" = "xyes" ]]; then
1461    LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1462   fi
1463  
1464 + dnl Check for linker script support
1465 + case $target_os:$target_cpu in
1466 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1467 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1468 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1469 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1470 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1471 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1472 + esac
1473 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1474 +  AC_CACHE_CHECK([whether linker script is usable],
1475 +    ac_cv_linker_script_works, [
1476 +    AC_LANG_SAVE
1477 +    AC_LANG_CPLUSPLUS
1478 +    saved_LDFLAGS="$LDFLAGS"
1479 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1480 +    AC_TRY_RUN(
1481 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1482 +      [ac_cv_linker_script_works=yes],
1483 +      [ac_cv_linker_script_works=no],
1484 +      dnl When cross-compiling, assume it works
1485 +      [ac_cv_linker_script_works="guessing yes"]
1486 +    )
1487 +    AC_LANG_RESTORE
1488 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1489 +      LDFLAGS="$saved_LDFLAGS"
1490 +      LINKER_SCRIPT_FLAGS=""
1491 +    fi
1492 +  ])
1493 + fi
1494 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1495 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1496 +
1497   dnl Generate Makefile.
1498   AC_SUBST(PERL)
1499   AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])

Diff Legend

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