1.1 --- a/Makefile.in	Fri Jul 11 04:02:25 2008 +0000
     1.2 +++ b/Makefile.in	Mon Jul 14 00:09:51 2008 +0000
     1.3 @@ -38,7 +38,7 @@
     1.4  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
     1.5  	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
     1.6  	$(top_srcdir)/configure $(top_srcdir)/test/Makefile.in AUTHORS \
     1.7 -	COPYING ChangeLog INSTALL NEWS TODO acconfig.h config.guess \
     1.8 +	COPYING ChangeLog INSTALL NEWS acconfig.h config.guess \
     1.9  	config.sub depcomp install-sh missing mkinstalldirs
    1.10  subdir = .
    1.11  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    1.12 @@ -103,8 +103,6 @@
    1.13  BUILD_SH4X86_TRUE = @BUILD_SH4X86_TRUE@
    1.14  BUILD_SYSTEST_FALSE = @BUILD_SYSTEST_FALSE@
    1.15  BUILD_SYSTEST_TRUE = @BUILD_SYSTEST_TRUE@
    1.16 -BUILD_X86_64_FALSE = @BUILD_X86_64_FALSE@
    1.17 -BUILD_X86_64_TRUE = @BUILD_X86_64_TRUE@
    1.18  CATALOGS = @CATALOGS@
    1.19  CATOBJEXT = @CATOBJEXT@
    1.20  CC = @CC@

     2.1 --- a/configure	Fri Jul 11 04:02:25 2008 +0000
     2.2 +++ b/configure	Mon Jul 14 00:09:51 2008 +0000
     2.3 @@ -746,8 +746,6 @@
     2.4  VIDEO_NSGL_FALSE
     2.5  BUILD_SH4X86_TRUE
     2.6  BUILD_SH4X86_FALSE
     2.7 -BUILD_X86_64_TRUE
     2.8 -BUILD_X86_64_FALSE
     2.9  AUDIO_OSX_TRUE
    2.10  AUDIO_OSX_FALSE
    2.11  PULSE_CFLAGS
    2.12 @@ -804,6 +802,7 @@
    2.13  enable_option_checking
    2.14  enable_maintainer_mode
    2.15  enable_dependency_tracking
    2.16 +enable_translator
    2.17  enable_trace
    2.18  enable_watch
    2.19  enable_sh4stats
    2.20 @@ -1468,6 +1467,7 @@
    2.21  			  (and sometimes confusing) to the casual installer
    2.22    --disable-dependency-tracking  speeds up one-time build
    2.23    --enable-dependency-tracking   do not reject slow dependency extractors
    2.24 +  --disable-translator    Disable the SH4 translator (Enable by default)
    2.25    --enable-trace          Enable generation of IO traces (warning: hurts
    2.26                            performance)
    2.27    --enable-watch          Enable watchpoints in the debugger (warning: hurts
    2.28 @@ -2276,7 +2276,7 @@
    2.29  
    2.30  # Define the identity of the package.
    2.31   PACKAGE=lxdream
    2.32 - VERSION=0.8.1
    2.33 + VERSION=0.8.3
    2.34  
    2.35  
    2.36  cat >>confdefs.h <<_ACEOF
    2.37 @@ -6551,6 +6551,13 @@
    2.38  
    2.39  
    2.40  
    2.41 +# Check whether --enable-translator was given.
    2.42 +if test "${enable_translator+set}" = set; then
    2.43 +  enableval=$enable_translator; true
    2.44 +else
    2.45 +  enable_translator=yes
    2.46 +fi
    2.47 +
    2.48  # Check whether --enable-trace was given.
    2.49  if test "${enable_trace+set}" = set; then
    2.50    enableval=$enable_trace; if test "$enableval" == "yes"; then
    2.51 @@ -8636,18 +8643,21 @@
    2.52  
    2.53  
    2.54  
    2.55 -case $host_cpu in
    2.56 -    i386|i486|i586|i686|x86_64)
    2.57 -	SH4_TRANSLATOR="x86"
    2.58 +
    2.59 +if test "x$enable_translator" != "xno"; then
    2.60 +    case $host_cpu in
    2.61 +        i386|i486|i586|i686|x86_64)
    2.62 +	    SH4_TRANSLATOR="x86"
    2.63  
    2.64  cat >>confdefs.h <<_ACEOF
    2.65  #define SH4_TRANSLATOR TARGET_X86
    2.66  _ACEOF
    2.67  ;;
    2.68 -esac
    2.69 -
    2.70 -
    2.71 -if test "$SH4_TRANSLATOR" = "x86" -o "$SH4_TRANSLATOR" = "x86_64"; then
    2.72 +    esac
    2.73 +fi
    2.74 +
    2.75 +
    2.76 +if test "$SH4_TRANSLATOR" = "x86"; then
    2.77    BUILD_SH4X86_TRUE=
    2.78    BUILD_SH4X86_FALSE='#'
    2.79  else
    2.80 @@ -8656,16 +8666,6 @@
    2.81  fi
    2.82  
    2.83  
    2.84 -
    2.85 -if test "$SH4_TRANSLATOR" = "x86_64"; then
    2.86 -  BUILD_X86_64_TRUE=
    2.87 -  BUILD_X86_64_FALSE='#'
    2.88 -else
    2.89 -  BUILD_X86_64_TRUE='#'
    2.90 -  BUILD_X86_64_FALSE=
    2.91 -fi
    2.92 -
    2.93 -
    2.94  if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
    2.95    { $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
    2.96  $as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
    2.97 @@ -11619,13 +11619,6 @@
    2.98  Usually this means the macro was only invoked conditionally." >&2;}
    2.99     { (exit 1); exit 1; }; }
   2.100  fi
   2.101 -if test -z "${BUILD_X86_64_TRUE}" && test -z "${BUILD_X86_64_FALSE}"; then
   2.102 -  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_X86_64\" was never defined.
   2.103 -Usually this means the macro was only invoked conditionally." >&5
   2.104 -$as_echo "$as_me: error: conditional \"BUILD_X86_64\" was never defined.
   2.105 -Usually this means the macro was only invoked conditionally." >&2;}
   2.106 -   { (exit 1); exit 1; }; }
   2.107 -fi
   2.108  if test -z "${AUDIO_OSX_TRUE}" && test -z "${AUDIO_OSX_FALSE}"; then
   2.109    { { $as_echo "$as_me:$LINENO: error: conditional \"AUDIO_OSX\" was never defined.
   2.110  Usually this means the macro was only invoked conditionally." >&5

     3.1 --- a/configure.in	Fri Jul 11 04:02:25 2008 +0000
     3.2 +++ b/configure.in	Mon Jul 14 00:09:51 2008 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  dnl Process this file with autoconf to produce a configure script.
     3.5  
     3.6  AC_INIT(configure.in)
     3.7 -AM_INIT_AUTOMAKE(lxdream, 0.8.1)
     3.8 +AM_INIT_AUTOMAKE(lxdream, 0.8.3)
     3.9  AM_MAINTAINER_MODE
    3.10  AM_CONFIG_HEADER(config.h)
    3.11  
    3.12 @@ -19,6 +19,9 @@
    3.13  
    3.14  dnl ---------------- enable/with flags ------------------
    3.15  
    3.16 +AC_ARG_ENABLE( translator, 
    3.17 +   AS_HELP_STRING( [--disable-translator], [Disable the SH4 translator (Enable by default)]),
    3.18 +   [true], [enable_translator=yes] )
    3.19  AC_ARG_ENABLE( trace, 
    3.20     AS_HELP_STRING( [--enable-trace], [Enable generation of IO traces (warning: hurts performance)]),
    3.21     [if test "$enableval" == "yes"; then
    3.22 @@ -149,14 +152,16 @@
    3.23  AC_CHECK_FUNC(glClampColorARB, [ AC_DEFINE([HAVE_OPENGL_CLAMP_COLOR],1,[Have Color Clamp]) ], [])
    3.24  
    3.25  
    3.26 -dnl Check for a supported cpu target for translation purposes
    3.27 -case $host_cpu in
    3.28 -    i386|i486|i586|i686|x86_64)
    3.29 -	SH4_TRANSLATOR="x86"
    3.30 -        AC_DEFINE_UNQUOTED(SH4_TRANSLATOR,[TARGET_X86], [SH4 Translator to use (if any)] );;
    3.31 -esac
    3.32 -AM_CONDITIONAL(BUILD_SH4X86, [test "$SH4_TRANSLATOR" = "x86" -o "$SH4_TRANSLATOR" = "x86_64"])
    3.33 -AM_CONDITIONAL(BUILD_X86_64, [test "$SH4_TRANSLATOR" = "x86_64"])
    3.34 +dnl ------------------- SH4 translator target -------------------
    3.35 +
    3.36 +if test "x$enable_translator" != "xno"; then
    3.37 +    case $host_cpu in
    3.38 +        i386|i486|i586|i686|x86_64)
    3.39 +	    SH4_TRANSLATOR="x86"
    3.40 +            AC_DEFINE_UNQUOTED(SH4_TRANSLATOR,[TARGET_X86], [SH4 Translator to use (if any)] );;
    3.41 +    esac
    3.42 +fi
    3.43 +AM_CONDITIONAL(BUILD_SH4X86, [test "$SH4_TRANSLATOR" = "x86"])
    3.44  
    3.45  dnl ------------------ Optional driver support -------------------
    3.46  dnl Check for Apple CoreAudio

     4.1 --- a/src/Makefile.in	Fri Jul 11 04:02:25 2008 +0000
     4.2 +++ b/src/Makefile.in	Mon Jul 14 00:09:51 2008 +0000
     4.3 @@ -239,8 +239,6 @@
     4.4  BUILD_SH4X86_TRUE = @BUILD_SH4X86_TRUE@
     4.5  BUILD_SYSTEST_FALSE = @BUILD_SYSTEST_FALSE@
     4.6  BUILD_SYSTEST_TRUE = @BUILD_SYSTEST_TRUE@
     4.7 -BUILD_X86_64_FALSE = @BUILD_X86_64_FALSE@
     4.8 -BUILD_X86_64_TRUE = @BUILD_X86_64_TRUE@
     4.9  CATALOGS = @CATALOGS@
    4.10  CATOBJEXT = @CATOBJEXT@
    4.11  CC = @CC@