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.33 by gbeauche, 2005-07-03T13:39:06Z vs.
Revision 1.39 by gbeauche, 2005-08-18T22:32:31Z

# Line 190 | Line 190 | no:linux*|no:netbsd*)
190      ])
191    ])
192    AC_CHECK_FUNCS(pthread_cancel)
193 <  AC_CHECK_FUNCS(pthread_cond_init)
193 >  AC_CHECK_FUNCS(pthread_cond_init pthread_testcancel)
194    AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
195    AC_CHECK_FUNCS(pthread_mutexattr_settype)
196    AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
# Line 331 | Line 331 | AC_TYPE_SIGNAL
331   AC_HEADER_TIME
332   AC_STRUCT_TM
333  
334 + dnl Check whether sys/socket.h defines type socklen_t.
335 + dnl (extracted from ac-archive/Miscellaneous)
336 + AC_CACHE_CHECK([for socklen_t],
337 +  ac_cv_type_socklen_t, [
338 +  AC_TRY_COMPILE([
339 +    #include <sys/types.h>
340 +    #include <sys/socket.h>
341 +  ], [socklen_t len = 42; return 0;],
342 +  ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no,
343 +  dnl When cross-compiling, do not assume anything.
344 +  ac_cv_type_socklen_t="guessing no"
345 +  )
346 + ])
347 + if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then
348 +  AC_DEFINE(socklen_t, int, [Define to 'int' if <sys/types.h> doesn't define.])
349 + fi
350 +
351   dnl Check whether struct sigaction has sa_restorer member.
352   AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
353    ac_cv_signal_sa_restorer, [
# Line 435 | Line 452 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
452   dnl Check for some MacOS X frameworks
453   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
454   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
455 + AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
456  
457   dnl Select system-dependant sources.
458   SERIALSRC=serial_unix.cpp
# Line 449 | Line 467 | linux*)
467    AUDIOSRC=audio_oss_esd.cpp
468    SCSISRC=Linux/scsi_linux.cpp
469    if [[ "x$EMULATED_PPC" = "xno" ]]; then
470 <    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
470 >    EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
471    fi
472    ;;
473   freebsd*)
# Line 458 | Line 476 | freebsd*)
476   netbsd*)
477    ETHERSRC=ether_unix.cpp
478    if [[ "x$EMULATED_PPC" = "xno" ]]; then
479 <    EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
479 >    EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
480    fi
481    ;;
482   darwin*)
483    ETHERSRC=ether_unix.cpp
484    if [[ "x$EMULATED_PPC" = "xno" ]]; then
485 <    EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S"
485 >    EXTRASYSSRCS="paranoia.cpp ppc_asm.S"
486    fi
487 <  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
487 >  if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
488      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
489    fi
490    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
# Line 1158 | Line 1176 | fi
1176   dnl Check for GCC 2.7 or higher.
1177   HAVE_GCC27=no
1178   AC_MSG_CHECKING(for GCC 2.7 or higher)
1179 < AC_EGREP_CPP(xyes,
1180 < [#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1181 <  xyes
1182 < #endif
1183 < ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1179 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1180 >                                     # error gcc < 2.7
1181 >                                     #endif
1182 >                                   ]])],
1183 >                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1184 >                  [AC_MSG_RESULT(no)])
1185  
1186   dnl Check for GCC 3.0 or higher.
1187   HAVE_GCC30=no
1188   AC_MSG_CHECKING(for GCC 3.0 or higher)
1189 < AC_EGREP_CPP(xyes,
1190 < [#if __GNUC__ >= 3
1191 <  xyes
1192 < #endif
1193 < ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1189 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1190 >                                     # error gcc < 3
1191 >                                     #endif
1192 >                                   ]])],
1193 >                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1194 >                  [AC_MSG_RESULT(no)])
1195  
1196   dnl Check for ICC.
1197   AC_MSG_CHECKING(for ICC)
# Line 1215 | Line 1235 | if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1235    CFLAGS="$SAVED_CFLAGS"
1236   fi
1237  
1238 < dnl Add -mdynamic-no-pic for MacOS X
1239 < if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1238 > dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1239 > if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1240    SAVED_CFLAGS="$CFLAGS"
1241    CFLAGS="$CFLAGS -mdynamic-no-pic"
1242    AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
# Line 1295 | Line 1315 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1315        else
1316          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1317        fi
1318 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
1318 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
1319        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1320          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1321        fi

Diff Legend

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