ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/configure.ac
(Generate patch)

Comparing BasiliskII/src/Unix/configure.ac (file contents):
Revision 1.59 by gbeauche, 2006-01-27T23:41:43Z vs.
Revision 1.63 by gbeauche, 2006-03-14T22:14:13Z

# Line 495 | Line 495 | AC_DEFUN([AC_CHECK_FRAMEWORK], [
495   ])
496  
497   dnl Check for some MacOS X frameworks
498 + AC_CHECK_FRAMEWORK(AppKit, [])
499   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
500   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
501   AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
# Line 579 | Line 580 | esac
580   dnl Is the slirp library supported?
581   case "$ac_cv_have_byte_bitfields" in
582   yes|"guessing yes")
583 +  CAN_SLIRP=yes
584    ETHERSRC=ether_unix.cpp
585    ;;
586   esac
587 < if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
587 > if [[ -n "$CAN_SLIRP" ]]; then
588    AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
589    SLIRP_SRCS="\
590      ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
# Line 1095 | Line 1097 | fi
1097   dnl A dummy program that returns always true
1098   AC_PATH_PROG([BLESS], "true")
1099  
1100 + dnl Check for linker script support
1101 + case $target_os:$target_cpu in
1102 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1103 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1104 + darwin*:powerpc)LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1105 + esac
1106 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1107 +  AC_CACHE_CHECK([whether linker script is usable],
1108 +    ac_cv_linker_script_works, [
1109 +    AC_LANG_SAVE
1110 +    AC_LANG_CPLUSPLUS
1111 +    saved_LDFLAGS="$LDFLAGS"
1112 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1113 +    AC_TRY_RUN(
1114 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1115 +      [ac_cv_linker_script_works=yes],
1116 +      [ac_cv_linker_script_works=no],
1117 +      dnl When cross-compiling, assume it works
1118 +      [ac_cv_linker_script_works="guessing yes"]
1119 +    )
1120 +    AC_LANG_RESTORE
1121 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1122 +      LDFLAGS="$saved_LDFLAGS"
1123 +      LINKER_SCRIPT_FLAGS=""
1124 +    fi
1125 +  ])
1126 + fi
1127 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1128 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1129 +
1130   dnl Determine the addressing mode to use
1131   if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
1132    ADDRESSING_MODE="real"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines