--- SheepShaver/src/Unix/configure.ac	2005/07/03 13:39:06	1.33
+++ SheepShaver/src/Unix/configure.ac	2005/08/18 22:32:31	1.39
@@ -190,7 +190,7 @@ no:linux*|no:netbsd*)
     ])
   ])
   AC_CHECK_FUNCS(pthread_cancel)
-  AC_CHECK_FUNCS(pthread_cond_init)
+  AC_CHECK_FUNCS(pthread_cond_init pthread_testcancel)
   AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
   AC_CHECK_FUNCS(pthread_mutexattr_settype)
   AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
@@ -331,6 +331,23 @@ AC_TYPE_SIGNAL
 AC_HEADER_TIME
 AC_STRUCT_TM
 
+dnl Check whether sys/socket.h defines type socklen_t.
+dnl (extracted from ac-archive/Miscellaneous)
+AC_CACHE_CHECK([for socklen_t],
+  ac_cv_type_socklen_t, [
+  AC_TRY_COMPILE([
+    #include <sys/types.h>
+    #include <sys/socket.h>
+  ], [socklen_t len = 42; return 0;],
+  ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no,
+  dnl When cross-compiling, do not assume anything.
+  ac_cv_type_socklen_t="guessing no"
+  )
+])
+if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then
+  AC_DEFINE(socklen_t, int, [Define to 'int' if <sys/types.h> doesn't define.])
+fi
+
 dnl Check whether struct sigaction has sa_restorer member.
 AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
   ac_cv_signal_sa_restorer, [
@@ -435,6 +452,7 @@ AC_DEFUN(AC_CHECK_FRAMEWORK, [
 dnl Check for some MacOS X frameworks
 AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
 AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
+AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
 
 dnl Select system-dependant sources.
 SERIALSRC=serial_unix.cpp
@@ -449,7 +467,7 @@ linux*)
   AUDIOSRC=audio_oss_esd.cpp
   SCSISRC=Linux/scsi_linux.cpp
   if [[ "x$EMULATED_PPC" = "xno" ]]; then
-    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
+    EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
   fi
   ;;
 freebsd*)
@@ -458,15 +476,15 @@ freebsd*)
 netbsd*)
   ETHERSRC=ether_unix.cpp
   if [[ "x$EMULATED_PPC" = "xno" ]]; then
-    EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
+    EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
   fi
   ;;
 darwin*)
   ETHERSRC=ether_unix.cpp
   if [[ "x$EMULATED_PPC" = "xno" ]]; then
-    EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S"
+    EXTRASYSSRCS="paranoia.cpp ppc_asm.S"
   fi
-  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
+  if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
     EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
   fi
   if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
@@ -1158,20 +1176,22 @@ fi
 dnl Check for GCC 2.7 or higher.
 HAVE_GCC27=no
 AC_MSG_CHECKING(for GCC 2.7 or higher)
-AC_EGREP_CPP(xyes,
-[#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
-  xyes
-#endif
-], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
+                                     # error gcc < 2.7
+                                     #endif
+                                   ]])],
+                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
+                  [AC_MSG_RESULT(no)])
 
 dnl Check for GCC 3.0 or higher.
 HAVE_GCC30=no
 AC_MSG_CHECKING(for GCC 3.0 or higher)
-AC_EGREP_CPP(xyes,
-[#if __GNUC__ >= 3
-  xyes
-#endif
-], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
+                                     # error gcc < 3
+                                     #endif
+                                   ]])],
+                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
+                  [AC_MSG_RESULT(no)])
 
 dnl Check for ICC.
 AC_MSG_CHECKING(for ICC)
@@ -1215,8 +1235,8 @@ if [[ "x$HAVE_GCC30" = "xyes" ]]; then
   CFLAGS="$SAVED_CFLAGS"
 fi
 
-dnl Add -mdynamic-no-pic for MacOS X
-if [[ "x$HAVE_GCC30" = "xyes" ]]; then
+dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
+if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
   SAVED_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -mdynamic-no-pic"
   AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
@@ -1295,7 +1315,7 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
       else
         DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
       fi
-      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
+      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
       if [[ "x$HAVE_GCC30" = "xyes" ]]; then
         DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
       fi