--- SheepShaver/src/Unix/configure.ac	2010/10/19 22:20:01	1.69
+++ SheepShaver/src/Unix/configure.ac	2012/06/16 02:16:40	1.74
@@ -5,6 +5,13 @@ AC_INIT([SheepShaver], 2.3, [Christian.B
 AC_CONFIG_SRCDIR(main_unix.cpp)
 AC_PREREQ(2.52)
 AC_CONFIG_HEADER(config.h)
+AH_TOP(
+#ifndef CONFIG_H
+#define CONFIG_H
+)
+AH_BOTTOM(
+#endif /* CONFIG_H */
+)
 
 dnl Canonical system information.
 AC_CANONICAL_HOST
@@ -363,7 +370,7 @@ AC_CHECK_HEADERS(mach/vm_map.h mach/mach
 AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
 AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
 AC_CHECK_HEADERS(sys/time.h sys/poll.h sys/select.h arpa/inet.h)
-AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
+AC_CHECK_HEADERS(netinet/in.h linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -701,6 +708,8 @@ if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
   KEYCODES="../SDL/keycodes"
   if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
     EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
+    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/utils_macosx.mm"
+    CPPFLAGS="$CPPFLAGS -I../MacOSX"
   else
     EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
   fi
@@ -744,6 +753,9 @@ dnl Check that the host supports TUN/TAP
 AC_CACHE_CHECK([whether TUN/TAP is supported],
   ac_cv_tun_tap_support, [
   AC_TRY_COMPILE([
+	#if defined(HAVE_NETINET_IN_H)
+	#include <netinet/in.h>
+	#endif
     #if defined(HAVE_LINUX_IF_H) && defined(HAVE_LINUX_IF_TUN_H)
     #include <linux/if.h>
     #include <linux/if_tun.h>
@@ -1482,6 +1494,9 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
       powerpc:mach)
         ac_cv_use_dyngen=yes
         ;;
+      x86_64:mach)
+        ac_cv_use_dyngen=yes
+        ;;
       i?86:mach)
         ac_cv_use_dyngen=yes
         ;;
@@ -1556,7 +1571,7 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
         ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
     fi
   fi
-  CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
+  CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp ../kpx_cpu/ppc-dis.c"
 else
   WANT_JIT=no
 fi