[svn] / branches / release-1_3-branch / xvidcore / build / generic / configure.in Repository:
ViewVC logotype

Diff of /branches/release-1_3-branch/xvidcore/build/generic/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1788, Fri Nov 23 10:44:11 2007 UTC revision 1794, Fri Nov 14 15:43:28 2008 UTC
# Line 358  Line 358 
358     fi     fi
359    
360     dnl if yasm hasn't been found, then check for nasm (not buggy version)     dnl if yasm hasn't been found, then check for nasm (not buggy version)
361     if test "$found_nasm_comp_prog" = "no" -a "$ARCHITECTURE" != "X86_64" ; then     if test "$found_nasm_comp_prog" = "no" ; then
362         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])
363         if test "$ac_nasm" = "yes" ; then         if test "$ac_nasm" = "yes" ; then
364             dnl             dnl
# Line 379  Line 379 
379             fi             fi
380             AC_MSG_RESULT([$nasm_patch])             AC_MSG_RESULT([$nasm_patch])
381    
382             if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then             dnl need nasm 2.x for SSE3/4 and X86_64
               if test "$nasm_minor" -lt "$minimum_nasm_minor_version" ; then  
383                   if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then                   if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then
384                      AC_MSG_WARN([nasm version is too old])                      AC_MSG_WARN([nasm version is too old])
385                   else                   else
386                     found_nasm_comp_prog="yes"                     found_nasm_comp_prog="yes"
387                             chosen_asm_prog="$nasm_prog"                             chosen_asm_prog="$nasm_prog"
388                   fi                   fi
               else  
                  found_nasm_comp_prog="yes"  
                      chosen_asm_prog="$nasm_prog"  
               fi  
            else  
                found_nasm_comp_prog="yes"  
                        chosen_asm_prog="$nasm_prog"  
            fi  
389         fi         fi
390     fi     fi
391    

Legend:
Removed from v.1788  
changed lines
  Added in v.1794

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4