--- SheepShaver/src/Unix/configure.ac	2005/06/11 16:47:00	1.23
+++ SheepShaver/src/Unix/configure.ac	2005/06/14 06:35:00	1.25
@@ -1033,7 +1033,7 @@ fi
 AC_MSG_RESULT($HAVE_ICC)
 
 dnl Determine the generated object format
-AC_CACHE_CHECK([whether the compiler can generate ELF objects],
+AC_CACHE_CHECK([the format of compiler generated objects],
   ac_cv_object_format, [
   echo 'int i;' > conftest.$ac_ext
   ac_cv_object_format=no
@@ -1042,6 +1042,9 @@ AC_CACHE_CHECK([whether the compiler can
     *"ELF"*)
       ac_cv_object_format=elf
       ;;
+    *"Mach-O"*)
+      ac_cv_object_format=mach
+      ;;
     *)
       ac_cv_object_format=unknown
       ;;
@@ -1074,6 +1077,9 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
       i?86:elf)
         ac_cv_use_dyngen=yes
         ;;
+      powerpc:mach)
+        ac_cv_use_dyngen=yes
+        ;;
       *:*)
         ac_cv_use_dyngen=no
         ;;
@@ -1099,14 +1105,19 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
       case $host_cpu in
       i?86)
         DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
-        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
-          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
-        else
-          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
+        ;;
+      powerpc)
+        if [[ "x$ac_cv_object_format" = "xmach" ]]; then
+          DYNGEN_OP_FLAGS="-mdynamic-no-pic"
         fi
         ;;
       esac
-      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -g0"
+      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
+        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
+      else
+        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
+      fi
+      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -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
@@ -1132,7 +1143,7 @@ if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
   AC_CACHE_CHECK([whether static data regions are executable],
     ac_cv_have_static_data_exec, [
     AC_TRY_RUN([int main(void) {
-#if defined(__powerpc__)
+#if defined(__powerpc__) || defined(__ppc__)
       static unsigned int p[8] = {0x4e800020,};
       asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
       asm volatile("sync" : : : "memory");