- fix ./configure --disable-asm

- fix asm build of encoder on 64bit


svn path=/trunk/theora/; revision=12867

configure.ac

@@ -120,14 +120,12 @@ if test "x${ac_enable_asm}" = xyes; then
     fi
     
     AC_DEFINE([OC_X86ASM], [], [enable x86 assambler optimization])
-    AM_CONDITIONAL(OC_X86ASM,true)
       ;;
   x86_64)
     cpu_x86_64=yes
     cpu_optimization="64 bit x86"
     AC_DEFINE([USE_ASM], [],  [make use of asm optimization])  
     AC_DEFINE([OC_X86ASM], [], [enable x86 assambler optimization])
-    AM_CONDITIONAL(OC_X86ASM,true)
     ;;
   esac
 else
@@ -135,6 +133,7 @@ else
 fi
 AM_CONDITIONAL([CPU_x86_64], [test x$cpu_x86_64 = xyes])
 AM_CONDITIONAL([CPU_x86_32], [test x$cpu_x86_32 = xyes])
+AM_CONDITIONAL(OC_X86ASM,[test x$ac_enable_asm = xyes])
 
 # Test whenever ld supports -version-script
 AC_PROG_LD

lib/Makefile.am

@@ -47,7 +47,7 @@ encoder_sources = \
 	enc/dsp.c
 	
 if CPU_x86_64
-enc_arch_dir = enc/x86_64
+arch_dir = enc/x86_64
 encoder_arch_sources= \
 	$(arch_dir)/dct_decode_mmx.c \
 	$(arch_dir)/dsp_mmx.c \