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.51 by cebix, 2005-06-30T21:25:26Z vs.
Revision 1.65 by gbeauche, 2006-03-25T07:08:50Z

# Line 136 | Line 136 | dnl Checks for libraries.
136   AC_CHECK_LIB(posix4, sem_init)
137   AC_CHECK_LIB(rt, timer_create)
138   AC_CHECK_LIB(rt, shm_open)
139 + AC_CHECK_LIB(m, cos)
140  
141   dnl Do we need SDL?
142   WANT_SDL=no
# Line 309 | Line 310 | AC_SYS_LARGEFILE
310  
311   dnl Checks for header files.
312   AC_HEADER_STDC
313 < AC_CHECK_HEADERS(unistd.h stdlib.h fcntl.h sys/types.h sys/time.h sys/mman.h mach/mach.h)
313 > AC_CHECK_HEADERS(stdlib.h stdint.h)
314 > AC_CHECK_HEADERS(unistd.h fcntl.h sys/types.h sys/time.h sys/mman.h mach/mach.h)
315   AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
316   AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
317   AC_CHECK_HEADERS(sys/poll.h sys/select.h)
# Line 420 | Line 422 | AC_CHECK_FILE([/dev/ptc],
422   dnl (end of code from openssh-3.2.2p1 configure.ac)
423  
424  
425 + dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
426 + dnl doesn't work or is unimplemented. On these systems (mostly older
427 + dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
428 + AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
429 +  ac_cv_nonblocking_io, [
430 +  case "$host" in
431 +  *-*-osf*)
432 +    ac_cv_nonblocking_io=FIONBIO
433 +    ;;
434 +  *-*-sunos4*)
435 +    ac_cv_nonblocking_io=FIONBIO
436 +    ;;
437 +  *-*-ultrix*)
438 +    ac_cv_nonblocking_io=FIONBIO
439 +    ;;
440 +  *)
441 +    ac_cv_nonblocking_io=O_NONBLOCK
442 +    ;;
443 +  esac
444 + ])
445 + if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
446 +  AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
447 + fi
448 +
449 + dnl Check whether compiler supports byte bit-fields
450 + AC_CACHE_CHECK([whether compiler supports byte bit-fields],
451 +  ac_cv_have_byte_bitfields, [
452 +  AC_LANG_SAVE
453 +  AC_LANG_CPLUSPLUS
454 +  AC_TRY_RUN([
455 +    struct A {
456 +      unsigned char b1:4;
457 +      unsigned char b2:4;
458 +      unsigned char c;
459 +      unsigned short s;
460 +      unsigned char a[4];
461 +    };
462 +
463 +    int main(void) {
464 +      A a;
465 +      return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
466 +    }],
467 +    [ac_cv_have_byte_bitfields=yes],
468 +    [ac_cv_have_byte_bitfields=no],
469 +    dnl When cross-compiling, assume only GCC supports this
470 +    [if [[ "$GCC" = "yes" ]]; then
471 +      ac_cv_have_byte_bitfields="guessing yes"
472 +    else
473 +      ac_cv_have_byte_bitfields="guessing no"
474 +    fi]
475 +    )
476 +  AC_LANG_RESTORE
477 + ])
478 +
479   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
480   AC_DEFUN([AC_CHECK_FRAMEWORK], [
481    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
# Line 428 | Line 484 | AC_DEFUN([AC_CHECK_FRAMEWORK], [
484      saved_LIBS="$LIBS"
485      LIBS="$LIBS -framework $1"
486      AC_TRY_LINK(
487 <      [$2], [int main(void) { return 0; }],
487 >      [$2], [],
488        [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
489      )
490    ])
# Line 439 | 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 489 | Line 546 | solaris*)
546    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
547    ;;
548   irix*)
492  ETHERSRC=ether_unix.cpp
549    AUDIOSRC=Irix/audio_irix.cpp
550    EXTRASYSSRCS=Irix/unaligned.c
495  dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
496  DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
551    LIBS="$LIBS -laudio"
552    WANT_ESD=no
553  
# Line 503 | Line 557 | irix*)
557    CFLAGS=`echo "$CFLAGS -IPA" | sed -e "s/-g//g"`
558    AC_MSG_CHECKING(if "-IPA" works)
559    dnl Do a test compile of an empty function
560 <  AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
560 >  AC_TRY_COMPILE([#if defined __GNUC__
561 >                  # error GCC does not support IPA yet
562 >                  #endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
563    CFLAGS="$ocflags"
564    ;;
565   darwin*)
# Line 522 | Line 578 | cygwin*)
578   esac
579  
580   dnl Is the slirp library supported?
581 < if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
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 [[ -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 1035 | 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 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1105 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1106 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1107 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1108 + esac
1109 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1110 +  AC_CACHE_CHECK([whether linker script is usable],
1111 +    ac_cv_linker_script_works, [
1112 +    AC_LANG_SAVE
1113 +    AC_LANG_CPLUSPLUS
1114 +    saved_LDFLAGS="$LDFLAGS"
1115 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1116 +    AC_TRY_RUN(
1117 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1118 +      [ac_cv_linker_script_works=yes],
1119 +      [ac_cv_linker_script_works=no],
1120 +      dnl When cross-compiling, assume it works
1121 +      [ac_cv_linker_script_works="guessing yes"]
1122 +    )
1123 +    AC_LANG_RESTORE
1124 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1125 +      LDFLAGS="$saved_LDFLAGS"
1126 +      LINKER_SCRIPT_FLAGS=""
1127 +    fi
1128 +  ])
1129 + fi
1130 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1131 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1132 +
1133   dnl Determine the addressing mode to use
1134   if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
1135    ADDRESSING_MODE="real"
# Line 1112 | Line 1207 | AC_MSG_RESULT($HAVE_GAS)
1207   dnl Check for GCC 2.7 or higher.
1208   HAVE_GCC27=no
1209   AC_MSG_CHECKING(for GCC 2.7 or higher)
1210 < AC_EGREP_CPP(xyes,
1211 < [#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1212 <  xyes
1213 < #endif
1214 < ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1210 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1211 >                                     # error gcc < 2.7
1212 >                                     #endif
1213 >                                   ]])],
1214 >                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1215 >                  [AC_MSG_RESULT(no)])
1216  
1217   dnl Check for GCC 3.0 or higher.
1218   HAVE_GCC30=no
1219   AC_MSG_CHECKING(for GCC 3.0 or higher)
1220 < AC_EGREP_CPP(xyes,
1221 < [#if __GNUC__ >= 3
1222 <  xyes
1223 < #endif
1224 < ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1220 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1221 >                                     # error gcc < 3
1222 >                                     #endif
1223 >                                   ]])],
1224 >                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1225 >                  [AC_MSG_RESULT(no)])
1226  
1227   dnl Check for ICC.
1228   AC_MSG_CHECKING(for ICC)
# Line 1191 | Line 1288 | if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1288    CFLAGS="$SAVED_CFLAGS"
1289   fi
1290  
1291 + dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1292 + if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1293 +  SAVED_CFLAGS="$CFLAGS"
1294 +  CFLAGS="$CFLAGS -mdynamic-no-pic"
1295 +  AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1296 +    ac_cv_gcc_mdynamic_no_pic, [
1297 +    AC_TRY_COMPILE([],[],[ac_cv_gcc_mdynamic_no_pic=yes],[ac_cv_gcc_mdynamic_no_pic=no])
1298 +  ])
1299 +  if [[ "x$ac_cv_gcc_mdynamic_no_pic" = "xyes" ]]; then
1300 +    CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
1301 +  else
1302 +    CFLAGS="$SAVED_CFLAGS"
1303 +  fi
1304 + fi
1305 +
1306   dnl Select appropriate CPU source and REGPARAM define.
1307   ASM_OPTIMIZATIONS=none
1308   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines