--- SheepShaver/src/Unix/configure.ac	2006/07/06 00:07:47	1.53
+++ SheepShaver/src/Unix/configure.ac	2007/01/24 14:33:52	1.56
@@ -245,6 +245,8 @@ dnl We use GTK+ if possible.
 UISRCS=../dummy/prefs_editor_dummy.cpp
 case "x$WANT_GTK" in
 xgtk2*)
+  WANT_GTK=no
+  ifdef([AM_PATH_GTK_2_0],
   AM_PATH_GTK_2_0(1.3.15, [
     GUI_CFLAGS="$GTK_CFLAGS"
     GUI_LIBS="$GTK_LIBS"
@@ -258,19 +260,20 @@ xgtk2*)
     *)
       AC_MSG_WARN([Could not find GTK+, disabling user interface.])
       WANT_GTK=no
-      ;;
+     ;;
     esac
-  ])
-  ;;
+  ]))
 esac
 if [[ "x$WANT_GTK" = "xgtk" ]]; then
+  WANT_GTK=no
+  ifdef([AM_PATH_GTK],
   AM_PATH_GTK(1.2.0, [
     GUI_CFLAGS="$GTK_CFLAGS"
     GUI_LIBS="$GTK_LIBS"
+    WANT_GTK=gtk
   ], [
     AC_MSG_WARN([Could not find GTK+, disabling user interface.])
-    WANT_GTK=no
-  ])
+  ]))
 fi
 if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
   AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
@@ -290,15 +293,17 @@ AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
 
 dnl We use ESD if possible.
 if [[ "x$WANT_ESD" = "xyes" ]]; then
+  WANT_ESD=no
+  ifdef([AM_PATH_ESD],
   AM_PATH_ESD(0.2.8, [
     AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
     CFLAGS="$CFLAGS $ESD_CFLAGS"
     CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
     LIBS="$LIBS $ESD_LIBS"
+    WANT_ESD=yes
   ], [
     AC_MSG_WARN([Could not find ESD, disabling ESD support.])
-    WANT_ESD=no
-  ])
+  ]))
 fi
 
 dnl We use 64-bit file size support if possible.
@@ -1347,7 +1352,8 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
     ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
     ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
     ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
-    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
+    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
+    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
   CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
 
   dnl Enable JIT compiler, if possible
@@ -1440,39 +1446,14 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
       CPUSRCS="\
         ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
         ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
-        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
+        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
+        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
     fi
   fi
   CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
 else
   WANT_JIT=no
 fi
-if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
-  AC_CACHE_CHECK([whether static data regions are executable],
-    ac_cv_have_static_data_exec, [
-    AC_TRY_RUN([int main(void) {
-#if defined(__powerpc__) || defined(__ppc__)
-      static unsigned int p[8] = {0x4e800020,};
-      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
-      asm volatile("sync" : : : "memory");
-      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
-      asm volatile("sync" : : : "memory");
-      asm volatile("isync" : : : "memory");
-      ((void (*)(void))p)();
-      return 0;
-#endif
-      return 1;
-    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
-    dnl When cross-compiling, do not assume anything.
-    ac_cv_have_static_data_exec=no
-    )
-  ])
-else
-  ac_cv_use_dyngen=no
-fi
-AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
-  [Define if your system marks static data pages as executable.])
-
 if [[ "x$WANT_JIT" = "xyes" ]]; then
   CPPFLAGS="$CPPFLAGS -DUSE_JIT"
 fi