--- configure.ac.non-x86	2008-07-06 10:03:19.000000000 +0200
+++ configure.ac	2009-12-04 02:05:46.000000000 +0100
@@ -36,7 +36,7 @@
 dnl System type
 AC_CANONICAL_HOST
 case $host_cpu in
-i686|x86|x86_64|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*)
+i686|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*)
 AC_DEFINE(HAVE_ARCH_X86,,[Whether this computer has an x86 CPU])
 ;;
 esac
--- src/defines.h.non-x86	2008-07-06 10:55:59.000000000 +0200
+++ src/defines.h	2009-12-04 02:07:18.000000000 +0100
@@ -24,7 +24,7 @@
 /* #undef SIZEOF_SIZE_T */
 
 /* Whether this computer has an x86 CPU */
-#define HAVE_ARCH_X86 
+/* #undef #define HAVE_ARCH_X86 */
 
 /* The number of CPUs in this machine */ 
 /* #undef CPU_COUNT */
--- src/sample.c.non-x86	2005-07-04 19:08:19.000000000 +0200
+++ src/sample.c	2009-12-04 02:05:46.000000000 +0100
@@ -616,6 +616,7 @@
     
     cpu_caps = arbiter_get_cpu_caps();
 
+#ifdef HAVE_ARCH_X86
 #if USE_MMX_MINMAX == 3
     DEBUG("using static 3DNow! minmax\n");
 #elif USE_MMX_MINMAX == 2
@@ -641,6 +642,9 @@
 #else
     DEBUG("Using plain C minmax\n");
 #endif /* USE_MMX_MINMAX */
+#else
+    DEBUG("Using plain C minmax\n");
+#endif
 
     return 0;
 }
--- src/sample.h.non-x86	2005-06-19 17:44:27.000000000 +0200
+++ src/sample.h	2009-12-04 02:05:46.000000000 +0100
@@ -25,6 +25,7 @@
 #include <config.h>
 #include <audiofile.h>
 
+#ifdef HAVE_ARCH_X86
 #if USE_MMX_MINMAX == 2
 #define PEAK_MIN_FUNC min_int8_mmx2
 #define PEAK_MAX_FUNC max_int8_mmx2
@@ -47,6 +48,14 @@
 #define MIN16_FUNC peak_funcs.min16_func
 #define MAX16_FUNC peak_funcs.max16_func
 #endif
+#else
+#define PEAK_MIN_FUNC peak_funcs.peak_min_func
+#define PEAK_MAX_FUNC peak_funcs.peak_max_func
+#define MIN8_FUNC peak_funcs.min8_func
+#define MAX8_FUNC peak_funcs.max8_func
+#define MIN16_FUNC peak_funcs.min16_func
+#define MAX16_FUNC peak_funcs.max16_func
+#endif
 
 struct peak_func_table {
     graph_bits_unit_t (*peak_min_func)(const peak_unit_t *a, int count);