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.50 by gbeauche, 2006-05-01T22:33:34Z vs.
Revision 1.53 by gbeauche, 2006-07-06T00:07:47Z

# Line 246 | 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.])
249      GUI_CFLAGS="$GTK_CFLAGS"
250      GUI_LIBS="$GTK_LIBS"
252    UISRCS=prefs_editor_gtk.cpp
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, [
270    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
268      GUI_CFLAGS="$GTK_CFLAGS"
269      GUI_LIBS="$GTK_LIBS"
273    UISRCS=prefs_editor_gtk.cpp
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  
# Line 1414 | Line 1414 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1414        x*) have_dyngen_gcc3=yes ;;
1415        esac
1416        if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1417 <        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1417 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1418        else
1419          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1420        fi
# Line 1485 | Line 1485 | if [[ "x$HAVE_IPA" = "xyes" ]]; then
1485    LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1486   fi
1487  
1488 + dnl Check for linker script support
1489 + case $target_os:$target_cpu in
1490 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1491 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1492 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1493 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1494 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1495 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1496 + esac
1497 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1498 +  AC_CACHE_CHECK([whether linker script is usable],
1499 +    ac_cv_linker_script_works, [
1500 +    AC_LANG_SAVE
1501 +    AC_LANG_CPLUSPLUS
1502 +    saved_LDFLAGS="$LDFLAGS"
1503 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1504 +    AC_TRY_RUN(
1505 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1506 +      [ac_cv_linker_script_works=yes],
1507 +      [ac_cv_linker_script_works=no],
1508 +      dnl When cross-compiling, assume it works
1509 +      [ac_cv_linker_script_works="guessing yes"]
1510 +    )
1511 +    AC_LANG_RESTORE
1512 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1513 +      LDFLAGS="$saved_LDFLAGS"
1514 +      LINKER_SCRIPT_FLAGS=""
1515 +    fi
1516 +  ])
1517 + fi
1518 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1519 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1520 +
1521   dnl Generate Makefile.
1522   AC_SUBST(PERL)
1523   AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines