check for i686 artch and only then compile the mmx asm (i586 isnt guaranteed

to have mmx - NB libs built for mmx will NOt work on non mmx boxes right now
need to do a runtime chekc for that)


SVN revision: 2448

configure.in

@@ -2,12 +2,16 @@ dnl Process this file with autoconf to create configure.
 
 AC_INIT(src/Imlib2.h)
 AM_CONFIG_HEADER(config.h)
+AC_CANONICAL_SYSTEM
+if test x$target_cpu = xi686; then
+  AC_DEFINE(DO_MMX_ASM, 1, [Pentium II/III and up detected - enabling ASM])
+fi
 AM_INIT_AUTOMAKE(imlib2, 0.0.3)
 
 pkglibdir='${libdir}'/loaders
 AC_SUBST(pkglibdir)
 
-AC_C_BIGENDIAN
+AC_C_BIGENDIAN	      
 
 AC_LIBLTDL_CONVENIENCE
 AC_CONFIG_SUBDIRS(libltdl)

src/asm_blend.S

@@ -1,3 +1,7 @@
+#include <config.h>
+
+#ifdef DO_MMX_ASM
+
 /*
 * AlphaBlending using MMX
 * 
@@ -109,3 +113,4 @@ __imlib_asm_blend_rgba_to_rgb:
   popl      %ebp
 ret
 
+#endif

src/blend.c

@@ -76,7 +76,7 @@ static void
 __imlib_BlendRGBAToRGB(DATA32 *src, int src_jump, DATA32 *dst, int dst_jump, 
 		       int w, int h, ImlibColorModifier *cm)
 {
-#if 1
+#ifdef DO_MMX_ASM
    int y;
    
    __imlib_toggle_mmx();

src/blend.h

@@ -1,10 +1,6 @@
 #ifndef __BLEND
 #define __BLEND 1
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #ifndef WORDS_BIGENDIAN
 
 #define A_VAL(p) ((DATA8 *)(p))[3]

src/common.h

@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <config.h>
 
 #define DATABIG unsigned long long
 #define DATA64  unsigned long long